← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xfce4-utils/jaunty

« back to all changes in this revision

Viewing changes to gdm/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-02-07 11:23:12 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20090207112312-2mn6cn61863f49wi
Tags: 4.5.99.1-0ubuntu1
https://launchpad.net/bugs/264594
https://launchpad.net/bugs/232364
* Merge with Debian pkg-xfce UNRELEASED, remaining Ubuntu changes:
  - debian/control:
    + use our Vcs-* fields
    + build-depends on libdbus-glib-1-dev (>= 0.33)
    + allow gnome-screensaver to satisfy the screensaver Recommends. Prevents
      derivatives from pulling in xscreensaver. (LP: #264594)
  - debian/patches/00_xdg_data_dirs.patch: make sure to add /etc/xdg/xubuntu
    even if XDG_DATA_DIRS is already set
  - debian/patches/04_avoid-xcblib-hang.patch: avoid race condition and
    deadlock in libxcb by launching dbus-launch before gnome-screensaver
    (which should occur anyhow). (LP: #232364)
  - debian/patches/series: refreshed
  - debian/rules:
    + pass --with-vendor-info=Xubuntu to ./configure
    + do not replace firefox calls with iceweasel
  - debian/Xubuntu: added
* debian/patches/02_xfce4-about_return_version.patch: dropped, merged
  upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gdm/Makefile.am
1
 
 
2
 
gdm_prefix = @GDM_PREFIX@
3
 
switchdesk_prefix = "/usr/share/apps/switchdesk"
4
 
wmsession_prefix  = "$(gdm_prefix)/wmsession.d"
5
 
dmsession_prefix  = "$(gdm_prefix)/dm/Sessions"
6
 
gdmsession_prefix = "$(gdm_prefix)/gdm/Sessions"
7
 
 
8
 
noinst_DATA = $(xfce_FILES)
9
 
xfce_SOURCE = XFce4.in Xclients.xfce4.in 10XFce4.in xfce.desktop
10
 
xfce_FILES = XFce4 Xclients.xfce4 10XFce4
11
 
EXTRA_DIST = $(xfce_SOURCE)
12
 
DISTCLEANFILES = $(xfce_FILES)
13
 
 
14
 
XFce4 : $(srcdir)/XFce4.in
15
 
        @sed -e "s%BIN_DIR%$(bindir)%g"     $(srcdir)/XFce4.in > $@
16
 
 
17
 
10XFce4 : $(srcdir)/10XFce4.in
18
 
        @sed -e "s%BIN_DIR%$(bindir)%g"     $(srcdir)/10XFce4.in > $@
19
 
 
20
 
Xclients.xfce4 : $(srcdir)/Xclients.xfce4.in
21
 
        @sed -e "s%BIN_DIR%$(bindir)%g"     $(srcdir)/Xclients.xfce4.in > $@
22
 
 
23
 
install-data-local :
24
 
        test no = @USE_GDM@ || $(MAKE) install-gdm
25
 
 
26
 
install-gdm: $(xfce_FILES)
27
 
        $(mkinstalldirs) $(DESTDIR)$(switchdesk_prefix)
28
 
        $(mkinstalldirs) $(DESTDIR)$(wmsession_prefix)
29
 
        $(mkinstalldirs) $(DESTDIR)$(dmsession_prefix)
30
 
        $(mkinstalldirs) $(DESTDIR)$(gdmsession_prefix)
31
 
        $(mkinstalldirs) $(DESTDIR)$(datadir)/xsessions
32
 
        $(INSTALL_SCRIPT) XFce4 \
33
 
                $(DESTDIR)$(gdmsession_prefix)/XFce4
34
 
        $(INSTALL_SCRIPT) Xclients.xfce4 \
35
 
                $(DESTDIR)$(switchdesk_prefix)/Xclients.xfce4
36
 
        $(INSTALL_SCRIPT) 10XFce4 \
37
 
                $(DESTDIR)$(wmsession_prefix)/10XFce4
38
 
        $(INSTALL_SCRIPT) xfce.desktop \
39
 
                $(DESTDIR)$(dmsession_prefix)/xfce.desktop
40
 
        $(INSTALL_SCRIPT) xfce.desktop \
41
 
                $(DESTDIR)$(datadir)/xsessions/xfce.desktop
42
 
 
43
 
uninstall-local: uninstall-gdm
44
 
 
45
 
uninstall-gdm:
46
 
        rm -f $(DESTDIR)$(gdmsession_prefix)/XFce4
47
 
        rm -f $(DESTDIR)$(dmsession_prefix)/xfce.desktop
48
 
        rm -f $(DESTDIR)$(datadir)/xsessions/xfce.desktop
49
 
        rm -f $(DESTDIR)$(switchdesk_prefix)/Xclients.xfce4
50
 
        rm -f $(DESTDIR)$(wmsession_prefix)/10XFce4
51