← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/xdm/gutsy

« back to all changes in this revision

Viewing changes to config/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): David Nusinow, Eugene Konev
  • Date: 2006-06-30 00:42:11 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060630004211-m2ntbay7eepml8pb
Tags: 1:1.0.5-1
http://bugs.debian.org/369519
http://bugs.debian.org/365548
http://bugs.debian.org/373138
http://bugs.debian.org/373870
[ Eugene Konev ]
* New upstream release. Fixes security bug on linux-2.6 kernels.
* Don't build-depend on libselinux1-dev on non-linux arches, thanks
  Michael Banck and Christian Perrier (closes: #369519)
* Fix init script reload target, thanks Alexandr Kazda (closes: #365548)
* Fix authDir reference in xdm(1), thanks Kevin Ryde (closes: #373138)
* Update README.Debian, thanks Kevin Ryde (closes: #373870)
* Pass APP_MAN_SUFFIX=1 to configure explicitely.

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/Makefile.am
1
 
# $Id: Makefile.am,v 1.8 2005/12/11 20:43:49 alanc Exp $
 
1
# $XdotOrg: app/xdm/config/Makefile.am,v 1.9 2006/03/18 03:43:18 alanc Exp $
2
2
#
3
3
 
4
4
include $(top_srcdir)/cpprules.in
46
46
        -DXDM_BWPIXMAP=$(XDM_BWPIXMAP)
47
47
#endif
48
48
 
 
49
#if HAVE_MKTEMP_COMMAND
 
50
MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
 
51
#endif
 
52
 
49
53
CPP_FILES_FLAGS = -DBINDIR=$(bindir) -DDEFAULTVT=$(DEFAULTVT) \
50
54
    -DXDMDIR=$(XDMLIBDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \
51
55
    -DXDMCONFIGDIR=$(XDMCONFIGDIR) -DXDMSCRIPTDIR=$(XDMSCRIPTDIR) \
52
56
    -DSU=$(SU) -DCHOOSERPATH=$(XDMLIBDIR)/chooser $(XPMDEFINES) \
53
 
    -DSHELL_CMD=$(SHELL_CMD)
 
57
    -DSHELL_CMD=$(SHELL_CMD) $(MKTEMP_DEFINES)
54
58
 
55
59
Xservers.ws: $(srcdir)/Xservers.ws.cpp
56
60
        $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@