diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2005-07-26 03:37:52 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2005-07-26 03:37:52 +0000 |
| commit | 0b5079f0ac1bdd5ef3cef3da95826c7f65ee8f9a (patch) | |
| tree | 3ec44a432683e33a80127808ea8addad4f51c32d /config/Makefile.am | |
| parent | 1eda851b655001b379a4354efac79f3da38d1d1e (diff) | |
| download | gdm-0b5079f0ac1bdd5ef3cef3da95826c7f65ee8f9a.tar.gz | |
Now installs gdm.conf to /usr/share/gdm.
2005-07-25 Brian Cameron <brian.cameron@sun.com>
* config/Makefile.am: Now installs gdm.conf to
/usr/share/gdm.
Diffstat (limited to 'config/Makefile.am')
| -rw-r--r-- | config/Makefile.am | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 2ee6087e..06783006 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -1,5 +1,6 @@ pixmapdir = $(datadir)/pixmaps confdir = $(sysconfdir)/gdm +gdmconfdir = $(datadir)/gdm crossconfdir = $(sysconfdir)/dm localedir = $(sysconfdir)/gdm bisessdir = $(datadir)/gdm/BuiltInSessions @@ -49,8 +50,8 @@ uninstall-hook: $(DESTDIR)$(instsessdir)/gnome.desktop \ $(DESTDIR)$(instsessdir)/default.desktop \ $(DESTDIR)$(instsessdir)/CDE.desktop \ - $(DESTDIR)$(datadir)/gdm.conf \ - $(DESTDIR)$(datadir)/factory-gdm.conf \ + $(DESTDIR)$(gdmconfdir)/gdm/gdm.conf \ + $(DESTDIR)$(gdmconfdir)/factory-gdm.conf \ $(DESTDIR)$(confdir)/XKeepsCrashing \ $(DESTDIR)$(confdir)/Xsession \ $(DESTDIR)$(localedir)/locale.alias \ @@ -68,14 +69,14 @@ install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop I $(mkinstalldirs) $(DESTDIR)$(crossconfdir); \ chmod 755 $(DESTDIR)$(crossconfdir); \ fi - -if cmp -s $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf > /dev/null 2>&1 ; then \ - cp -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/gdm.conf.orig; \ - $(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/gdm.conf; \ + -if cmp -s $(DESTDIR)$(gdmconfdir)/gdm.conf $(DESTDIR)$(gdmconfdir)/factory-gdm.conf > /dev/null 2>&1 ; then \ + cp -f $(DESTDIR)$(gdmconfdir)/gdm.conf $(DESTDIR)$(gdmconfdir)/gdm.conf.orig; \ + $(INSTALL_DATA) gdm.conf $(DESTDIR)$(gdmconfdir)/gdm.conf; \ fi - if test '!' -f $(DESTDIR)$(confdir)/gdm.conf; then \ - $(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/gdm.conf; \ + if test '!' -f $(DESTDIR)$(gdmconfdir)/gdm.conf; then \ + $(INSTALL_DATA) gdm.conf $(DESTDIR)$(gdmconfdir)/gdm.conf; \ fi - $(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf + $(INSTALL_DATA) gdm.conf $(DESTDIR)$(gdmconfdir)/factory-gdm.conf $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession |