diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-01-02 12:52:23 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-01-02 12:52:23 +0000 |
| commit | 0883d42a315a99cbf323562c4505980fae7bb49e (patch) | |
| tree | f0653e6f1b08d25110900575c2af8a6d113adbb0 | |
| parent | cd580752709ce7ee5c69fb5838e47bd5757c6403 (diff) | |
| download | gdm-GDM2_2_13_0_4.tar.gz | |
Updated Corrected make distcheck issue.GDM2_2_13_0_4
2006-01-02 Brian Cameron <brian.cameron@sun.com>
* configure.ac: Updated
* config/Makefile.am: Corrected make distcheck issue.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | config/Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 9 insertions, 5 deletions
@@ -2,6 +2,7 @@ * Release 2.13.0.4: * NEWS, configure.ac: Updated + * config/Makefile.am: Corrected make distcheck issue. * docs/C/gdm.xml: Updated version/date. 2005-12-24 Brian Cameron <brian.cameron@sun.com> diff --git a/config/Makefile.am b/config/Makefile.am index aef9238f..b12764d6 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -13,12 +13,13 @@ postdir = $(sysconfdir)/gdm/PostSession predir = $(sysconfdir)/gdm/PreSession postlogindir = $(sysconfdir)/gdm/PostLogin -noinst_DATA = gdm.conf gdm.conf-custom +noinst_DATA = gdm.conf DESKTOP_FILES = default.desktop CDE.desktop gnome.desktop EXTRA_DIST = \ gdm.conf.in \ + gdm.conf-custom \ $(DESKTOP_FILES) \ default.desktop.in \ gnome.desktop.in \ @@ -61,7 +62,7 @@ uninstall-hook: $(DESTDIR)$(predir)/Default \ $(DESTDIR)$(postdir)/Default -install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop Init PostSession PreSession +install-data-hook: gdm.conf gdm.conf-custom Xsession gnome.desktop default.desktop CDE.desktop Init PostSession PreSession if test '!' -d $(DESTDIR)$(confdir); then \ $(mkinstalldirs) $(DESTDIR)$(confdir); \ chmod 755 $(DESTDIR)$(confdir); \ @@ -74,17 +75,19 @@ install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop I $(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \ chmod 755 $(DESTDIR)$(gdmconfdir); \ fi - -if ! cmp -s $(DESTDIR)$(gdmconfdir)/gdm.conf $(DESTDIR)$(gdmconfdir)/factory-gdm.conf > /dev/null 2>&1 ; then \ + if test -f $(DESTDIR)$(gdmconfdir)/gdm.conf; then \ + if ! cmp -s $(DESTDIR)$(gdmconfdir)/gdm.conf $(DESTDIR)$(gdmconfdir)/factory-gdm.conf > /dev/null 2>&1 ; then \ if test '!' -f $(DESTDIR)$(gdmconfdir)/gdm.conf-custom; then \ cp -f $(DESTDIR)$(gdmconfdir)/gdm.conf $(DESTDIR)$(gdmconfdir)/gdm.conf-custom; \ else \ cp -f $(DESTDIR)$(gdmconfdir)/gdm.conf $(DESTDIR)$(gdmconfdir)/gdm.conf.org; \ fi; \ + fi; \ fi $(INSTALL_DATA) gdm.conf $(DESTDIR)$(gdmconfdir)/gdm.conf chmod 444 $(DESTDIR)$(gdmconfdir)/gdm.conf if test '!' -f $(DESTDIR)$(gdmconfdir)/gdm.conf-custom; then \ - $(INSTALL_DATA) gdm.conf-custom $(DESTDIR)$(gdmconfdir)/gdm.conf-custom; \ + $(INSTALL_DATA) $(srcdir)/gdm.conf-custom $(DESTDIR)$(gdmconfdir)/gdm.conf-custom; \ chmod 644 $(DESTDIR)$(gdmconfdir)/gdm.conf-custom; \ fi $(INSTALL_DATA) gdm.conf $(DESTDIR)$(gdmconfdir)/factory-gdm.conf diff --git a/configure.ac b/configure.ac index c265c31d..9f9bf6b1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.52) AC_INIT(daemon/gdm.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gdm,2.13.0.3) +AM_INIT_AUTOMAKE(gdm,2.13.0.4) AC_CONFIG_MACRO_DIR([m4]) AM_MAINTAINER_MODE |