← Back to branch summary

~ubuntu-branches/ubuntu/precise/xdm/precise

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-01-30 00:53:09 UTC
  • mfrom: (9.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110130005309-30mjjyk7div7d494
Tags: 1:1.1.10-3ubuntu1
https://launchpad.net/bugs/682196
http://bugs.debian.org/556694
* Merge from debian unstable.  Remaining changes: (LP: #682196)
  - debian/{rules, xdm.install, local/ubuntu*}:
    + Add Ubuntu graphics and configure xdm to use them by default.
  - debian/patches/ubuntu_no_whiteglass.diff: Don't hardcode
    the default Xcursor theme to whiteglass. Use the Ubuntu
    default x-cursor-theme instead.
* debian/patches/ftbfs_binutils-gold.diff: Fix FTBFS with binutils-gold
  and ld --as-needed. (Closes: #556694)
* Dropped changes, no longer applicable:
  - debian/{xdm.postinst.in, xdm.postrm.in, xdm.preinst.in}

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
16
16
confflags += --with-pam \
17
17
        --with-xdmconfigdir=/etc/X11/xdm \
18
18
        --with-xdmscriptdir=\$${xdmconfigdir} \
19
 
        --with-xdmauthdir=/var/lib/xdm \
20
 
        --with-default-vt=vt7 \
 
19
        --with-authdir=/var/lib/xdm \
21
20
        --with-pixmapdir=/usr/share/X11/xdm/pixmaps \
22
21
        --with-color-pixmap=ubuntu.xpm \
23
22
        --with-bw-pixmap=ubuntu.xpm \
51
50
        confflags += --with-selinux
52
51
endif
53
52
 
54
 
BUILD_DIR := obj-$(DEB_BUILD_GNU_TYPE)
 
53
ifneq ($(DEB_BUILD_ARCH_OS), hurd)
 
54
        confflags += --with-default-vt=vt7
 
55
endif
 
56
 
 
57
BUILD_DIR := build
55
58
 
56
59
stampdir_targets+=config
57
60
config: $(STAMP_DIR)/config
70
73
                    --mandir=\$${prefix}/share/man \
71
74
                    --infodir=\$${prefix}/share/info \
72
75
                    $(confflags) \
73
 
                    CFLAGS="$(CFLAGS)" APP_MAN_SUFFIX=1
 
76
                    CFLAGS="$(CFLAGS)" APP_MAN_SUFFIX=1 \
 
77
                    DEF_USER_PATH="/usr/local/bin:/usr/bin:/bin:/usr/games" \
 
78
                    DEF_SYSTEM_PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
74
79
        cd $(BUILD_DIR) && $(MAKE)
75
80
        >$@
76
81
 
85
90
        cd $(BUILD_DIR) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
86
91
 
87
92
        install -m 755 debian/local/Xstartup \
88
 
                       $(CURDIR)/debian/tmp/etc/X11/xdm/
 
93
                       debian/tmp/etc/X11/xdm/
89
94
        install -m 755 debian/local/Xreset \
90
 
                       $(CURDIR)/debian/tmp/etc/X11/xdm/
 
95
                       debian/tmp/etc/X11/xdm/
91
96
        install -m 755 debian/local/Xsetup \
92
 
                       $(CURDIR)/debian/tmp/etc/X11/xdm/
 
97
                       debian/tmp/etc/X11/xdm/
93
98
 
94
99
        install -m 644 debian/local/xdm.options \
95
 
                       $(CURDIR)/debian/tmp/etc/X11/xdm/
96
 
        install -d $(CURDIR)/debian/tmp/usr/share/man/man5
 
100
                       debian/tmp/etc/X11/xdm/
 
101
        install -d debian/tmp/usr/share/man/man5
97
102
        install -m 644 debian/local/xdm.options.5 \
98
 
                       $(CURDIR)/debian/tmp/usr/share/man/man5/
 
103
                       debian/tmp/usr/share/man/man5/
99
104
        install -m 644 debian/local/ubuntu.xpm \
100
105
                       $(CURDIR)/debian/tmp/usr/share/X11/xdm/pixmaps/
101
106
        install -m 644 debian/local/ubuntubw.xpm \
102
107
                       $(CURDIR)/debian/tmp/usr/share/X11/xdm/pixmaps/
103
108
        install -m 644 debian/local/debian.xpm \
104
 
                       $(CURDIR)/debian/tmp/usr/share/X11/xdm/pixmaps/
 
109
                       debian/tmp/usr/share/X11/xdm/pixmaps/
105
110
        install -m 644 debian/local/debianbw.xpm \
106
 
                       $(CURDIR)/debian/tmp/usr/share/X11/xdm/pixmaps/
 
111
                       debian/tmp/usr/share/X11/xdm/pixmaps/
 
112
        install -d debian/tmp/etc/insserv.conf.d
 
113
        install -m 644 debian/xdm.insserv \
 
114
                       debian/tmp/etc/insserv.conf.d/xdm
107
115
        >$@
108
116
 
109
117
clean: xsfclean
112
120
        rm -rf $(BUILD_DIR)
113
121
        rm -f aclocal.m4 compile config.guess config.sub config.h.in configure
114
122
        rm -f depcomp install-sh ltmain.sh missing INSTALL
 
123
        rm -f m4/lt*.m4 m4/libtool.m4
115
124
        rm -f $$(find -name Makefile.in)
116
125
        dh_clean
117
126