summaryrefslogtreecommitdiff
path: root/x11/gdm/patches/patch-ae
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gdm/patches/patch-ae')
-rw-r--r--x11/gdm/patches/patch-ae28
1 files changed, 14 insertions, 14 deletions
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index 392195998e9..68e32d3d8d7 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
+$NetBSD: patch-ae,v 1.7 2005/02/03 13:37:03 jmmv Exp $
---- config/Makefile.in.orig 2004-06-11 18:41:00.000000000 +0200
+--- config/Makefile.in.orig 2005-02-02 18:35:44.000000000 +0100
+++ config/Makefile.in
-@@ -23,7 +23,7 @@ bindir = @bindir@
+@@ -240,7 +240,7 @@ prefix = @prefix@
+ program_transform_name = @program_transform_name@
sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
+ sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
+sysconfdir = @datadir@/examples
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
-@@ -301,11 +301,11 @@ gettextfoo.h: XKeepsCrashing Xsession.in
+ target_alias = @target_alias@
+ pixmapdir = $(datadir)/pixmaps
+ confdir = $(sysconfdir)/gdm
+@@ -478,11 +478,11 @@ uninstall-hook:
install-data-hook: gdm.conf Xsession gnome.desktop default.desktop CDE.desktop Default PostSession PreSession
if test '!' -d $(DESTDIR)$(confdir); then \
$(mkinstalldirs) $(DESTDIR)$(confdir); \
@@ -25,7 +25,7 @@ $NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
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; \
-@@ -319,19 +319,16 @@ install-data-hook: gdm.conf Xsession gno
+@@ -496,19 +496,16 @@ install-data-hook: gdm.conf Xsession gno
$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
@@ -48,7 +48,7 @@ $NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
fi
-if test -f $(DESTDIR)$(bisessdir)/Default.desktop; then \
-@@ -362,7 +359,7 @@ install-data-hook: gdm.conf Xsession gno
+@@ -539,7 +536,7 @@ install-data-hook: gdm.conf Xsession gno
if test '!' -d $(DESTDIR)$(initdir); then \
$(mkinstalldirs) $(DESTDIR)$(initdir); \
@@ -57,7 +57,7 @@ $NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
fi
-if test -f $(DESTDIR)$(initdir)/Default; then \
cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \
-@@ -371,13 +368,13 @@ install-data-hook: gdm.conf Xsession gno
+@@ -548,13 +545,13 @@ install-data-hook: gdm.conf Xsession gno
if test '!' -d $(DESTDIR)$(postlogindir); then \
$(mkinstalldirs) $(DESTDIR)$(postlogindir); \
@@ -73,7 +73,7 @@ $NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
fi
-if test -f $(DESTDIR)$(predir)/Default; then \
cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \
-@@ -386,7 +383,7 @@ install-data-hook: gdm.conf Xsession gno
+@@ -563,7 +560,7 @@ install-data-hook: gdm.conf Xsession gno
if test '!' -d $(DESTDIR)$(postdir); then \
$(mkinstalldirs) $(DESTDIR)$(postdir); \
@@ -82,7 +82,7 @@ $NetBSD: patch-ae,v 1.6 2004/06/20 21:25:46 jmmv Exp $
fi
-if test -f $(DESTDIR)$(postdir)/Default; then \
cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \
-@@ -395,26 +392,14 @@ install-data-hook: gdm.conf Xsession gno
+@@ -572,26 +569,14 @@ install-data-hook: gdm.conf Xsession gno
if test '!' -d $(DESTDIR)$(gnomercdir); then \
$(mkinstalldirs) $(DESTDIR)$(gnomercdir); \