Commit 6547f64c authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

Added distuninstallcheck_listfiles for the files in /var/scrollkeeper,

Tue Jan 25 17:18:00 2005  Brian Cameron <Brian.Cameron@Sun.Com>

        * This patch makes gdm2 build with newer versions of the build
          tools.  Previously it was requiring automake-1.4, autoconf-1.4,
          and clocal-1.4.  Better error checking in the newer version
          caught the following issues:
        * Makefile.am:  Added distuninstallcheck_listfiles for the
          files in /var/scrollkeeper, which were causing "makedist"
          to fail.  Removed intltool-modules/XML/Parser/Style/OrigTree.pm
          from EXTRA_DIST since that file isn't required by newer
          versions of intltool.
        * omf.make, xmldocs.make:  Fixed errors in "makedist".   I found a
          pointer to the fix here:
          mail.gnome.org/archives/desktop-devel-list/2003-December/msg00587.html
        * gui/Makefile.am, gui/greeter/themes/circles/Makefile.am,
          gui/modules/Makefile.am, gui/greeter/themes/happygnome/Makefile.am,
          config/Makefile.am, gui/greeter/themes/happygnome-list/Makefile.am:
          Added clean-local and uninstall-hook to fix errors in "makedist".
          Made sure all *.desktop files are in EXTRA_DIST.
        * daemon/slave.c: Not related to above patches.  Fixed grammar again
          since we aren't in a string freeze.  Sorry for the confusion.
parent 27e927e3
Tue Jan 25 17:18:00 2005 Brian Cameron <Brian.Cameron@Sun.Com>
* This patch makes gdm2 build with newer versions of the build
tools. Previously it was requiring automake-1.4, autoconf-1.4,
and clocal-1.4. Better error checking in the newer version
caught the following issues:
* Makefile.am: Added distuninstallcheck_listfiles for the
files in /var/scrollkeeper, which were causing "makedist"
to fail. Removed intltool-modules/XML/Parser/Style/OrigTree.pm
from EXTRA_DIST since that file isn't required by newer
versions of intltool.
* omf.make, xmldocs.make: Fixed errors in "makedist". I found a
pointer to the fix here:
mail.gnome.org/archives/desktop-devel-list/2003-December/msg00587.html
* gui/Makefile.am, gui/greeter/themes/circles/Makefile.am,
gui/modules/Makefile.am, gui/greeter/themes/happygnome/Makefile.am,
config/Makefile.am, gui/greeter/themes/happygnome-list/Makefile.am:
Added clean-local and uninstall-hook to fix errors in "makedist".
Made sure all *.desktop files are in EXTRA_DIST.
* daemon/slave.c: Not related to above patches. Fixed grammar again
since we aren't in a string freeze. Sorry for the confusion.
Tue Jan 25 17:18:00 2005 Brian Cameron <Brian.Cameron@Sun.Com>
* daemon/slave.c: Fixed grammar. Then backed out fix
......
......@@ -21,7 +21,6 @@ EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
intltool-modules/XML/Parser/Style/OrigTree.pm \
gdm-stop.in \
gdm-restart.in \
gdm-safe-restart.in \
......@@ -44,3 +43,5 @@ DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update
distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
......@@ -12,13 +12,15 @@ postdir = $(sysconfdir)/gdm/PostSession
predir = $(sysconfdir)/gdm/PreSession
postlogindir = $(sysconfdir)/gdm/PostLogin
noinst_DATA = gdm.conf
DESKTOP_FILES = default.desktop CDE.desktop gnome.desktop
EXTRA_DIST = \
gdm.conf.in \
gnome.desktop.in \
$(DESKTOP_FILES) \
default.desktop.in \
gnome.desktop.in \
CDE.desktop.in \
Xsession.in \
gdm \
......@@ -37,6 +39,26 @@ gettextfoo.h: XKeepsCrashing Xsession.in
@INTLTOOL_DESKTOP_RULE@
clean-local:
rm -f $(DESKTOP_FILES)
uninstall-hook:
rm -f $(DESTDIR)$(bisessdir)/gnome.desktop \
$(DESTDIR)$(bisessdir)/default.desktop \
$(DESTDIR)$(bisessdir)/CDE.desktop \
$(DESTDIR)$(instsessdir)/gnome.desktop \
$(DESTDIR)$(instsessdir)/default.desktop \
$(DESTDIR)$(instsessdir)/CDE.desktop \
$(DESTDIR)$(confdir)/gdm.conf \
$(DESTDIR)$(confdir)/factory-gdm.conf \
$(DESTDIR)$(confdir)/XKeepsCrashing \
$(DESTDIR)$(confdir)/Xsession \
$(DESTDIR)$(localedir)/locale.alias \
$(DESTDIR)$(initdir)/Default \
$(DESTDIR)$(postlogindir)/Default.sample \
$(DESTDIR)$(predir)/Default \
$(DESTDIR)$(postdir)/Default
install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop Default PostSession PreSession
if test '!' -d $(DESTDIR)$(confdir); then \
$(mkinstalldirs) $(DESTDIR)$(confdir); \
......
......@@ -2662,7 +2662,7 @@ gdm_slave_greeter (void)
gdm_error_box (d,
GTK_MESSAGE_ERROR,
_("Cannot start the greeter program, "
_("Cannot start the greeter program; "
"you will not be able to log in. "
"This display will be disabled. "
"Try logging in by other means and "
......
......@@ -136,10 +136,15 @@ gdmflexiserver_LDADD = \
-lviciousui-gnome
Settingsdir = $(datadir)/gnome/capplets
Settings_files = gdmphotosetup.desktop
Settings_in_files = gdmphotosetup.desktop.in
Settings_DATA = $(Settings_in_files:.desktop.in=.desktop)
Systemdir = $(datadir)/applications
System_files = \
gdmsetup.desktop \
gdmflexiserver.desktop \
gdmflexiserver-xnest.desktop
System_in_files = \
gdmsetup.desktop.in \
gdmflexiserver.desktop.in \
......@@ -168,6 +173,11 @@ EXTRA_DIST = \
$(Glade_DATA) \
$(Icons_DATA) \
$(System_DATA) \
$(System_files) \
$(System_in_files) \
$(Settings_DATA) \
$(Settings_files) \
$(Settings_in_files)
clean-local:
rm -f $(System_files) $(Settings_files)
......@@ -14,3 +14,6 @@ circles_in_files = \
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = $(circles_DATA) $(circles_in_files)
clean-local:
rm -f GdmGreeterTheme.desktop
......@@ -16,3 +16,7 @@ happygnome_in_files = \
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = $(happygnome_DATA) $(happygnome_in_files)
clean-local:
/bin/rm -f GdmGreeterTheme.desktop
......@@ -16,3 +16,6 @@ happygnome_in_files = \
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = $(happygnome_DATA) $(happygnome_in_files)
clean-local:
rm -f GdmGreeterTheme.desktop
......@@ -51,6 +51,12 @@ EXTRA_DIST = \
AccessKeyMouseEvents.in \
AccessDwellMouseEvents.in
uninstall-hook:
rm -f $(DESTDIR)$(moduleconfdir)/AccessKeyMouseEvents \
$(DESTDIR)$(moduleconfdir)/factory-AccessKeyMouseEvents \
$(DESTDIR)$(moduleconfdir)/AccessDwellMouseEvents \
$(DESTDIR)$(moduleconfdir)/factory-AccessDwellMouseEvents
install-data-hook: AccessKeyMouseEvents AccessDwellMouseEvents
if test '!' -d $(DESTDIR)$(moduleconfdir); then \
$(mkinstalldirs) $(DESTDIR)$(moduleconfdir); \
......
......@@ -50,9 +50,9 @@ install-data-hook-omf:
uninstall-local-omf:
-for file in $(srcdir)/*.omf; do \
basefile=`basename $$file`; \
rm -f $(omf_dest_dir)/$$basefile; \
rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \
done
-rmdir $(omf_dest_dir)
-rmdir $(DESTDIR)$(omf_dest_dir)
-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
clean-local-omf:
......
......@@ -83,7 +83,7 @@ uninstall-local-doc:
-if test "$(figdir)"; then \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
rm -f $(docdir)/$(figdir)/$$basefile; \
rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
done; \
rmdir $(DESTDIR)$(docdir)/$(figdir); \
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment