]> git.pld-linux.org Git - packages/gdm.git/blame - gdm-am_fixes.patch
projects / packages / gdm.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- some pld.org.pl->pld-linux.org cosmetics
[packages/gdm.git] / gdm-am_fixes.patch
CommitLineData
09f48ad9 1diff -u -r gdm-2.2.5.4/config/Makefile.am gdm-2.2.5.4.new/config/Makefile.am
2--- gdm-2.2.5.4/config/Makefile.am Fri Dec 7 06:15:49 2001
3+++ gdm-2.2.5.4.new/config/Makefile.am Sun Oct 27 13:02:32 2002
4@@ -31,85 +31,26 @@
155c899b 5 cat $^ | $(srcdir)/extract-shell.sh > gettextfoo.h
6
7 install-data-hook: gdm.conf gnomerc Gnome
8- if test '!' -d $(confdir); then \
9- $(mkinstalldirs) $(confdir); \
10- chmod 755 $(confdir); \
11- fi
12- if test '!' -f $(confdir)/gdm.conf; then \
13- $(INSTALL_DATA) gdm.conf $(confdir)/gdm.conf; \
14- fi
15- $(INSTALL_DATA) gdm.conf $(confdir)/factory-gdm.conf
16-
17- $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(confdir)/XKeepsCrashing
18-
19- -if test -f $(localedir)/locale.alias; then \
20- cp $(localedir)/locale.alias $(localedir)/locale.alias.orig; \
21- fi
22- $(INSTALL_DATA) $(srcdir)/locale.alias $(localedir)/locale.alias
23-
24- if test '!' -d $(sessdir); then \
25- $(mkinstalldirs) $(sessdir); \
26- chmod 755 $(sessdir); \
27- fi
28-
29- -if test -f $(sessdir)/Xsession; then \
30- cp $(sessdir)/Xsession $(sessdir)/Xsession.orig; \
31- fi
32- $(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession
33-
34- -if test -f $(sessdir)/Gnome; then \
35- cp $(sessdir)/Gnome $(sessdir)/Gnome.orig; \
36- fi
37- $(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome
38-
39- -if test -f /etc/redhat-release; then \
40- if test -f $(sessdir)/Default; then \
41- cp $(sessdir)/Default $(sessdir)/Default.orig; \
42- fi; \
43- $(INSTALL_SCRIPT) $(srcdir)/Default.redhat $(sessdir)/Default; \
44- fi
45-
46- if test '!' -d $(initdir); then \
47- $(mkinstalldirs) $(initdir); \
48- chmod 755 $(initdir); \
49- fi
50- -if test -f $(initdir)/Default; then \
51- cp $(initdir)/Default $(initdir)/Default.orig; \
52- fi
53- $(INSTALL_SCRIPT) $(srcdir)/Default $(initdir)/Default
54-
55- if test '!' -d $(predir); then \
56- $(mkinstalldirs) $(predir); \
57- chmod 755 $(predir); \
58- fi
59- -if test -f $(predir)/Default; then \
60- cp $(predir)/Default $(predir)/Default.orig; \
61- fi
62- $(INSTALL_SCRIPT) $(srcdir)/PreSession $(predir)/Default
63-
64- if test '!' -d $(postdir); then \
65- $(mkinstalldirs) $(postdir); \
66- chmod 755 $(postdir); \
67- fi
68- -if test -f $(postdir)/Default; then \
69- cp $(postdir)/Default $(postdir)/Default.orig; \
70- fi
71- $(INSTALL_SCRIPT) $(srcdir)/PostSession $(postdir)/Default
72-
73- if test '!' -d $(gnomercdir); then \
74- $(mkinstalldirs) $(gnomercdir); \
75- chmod 755 $(gnomercdir); \
76- fi
77-
78- if test '!' -f $(gnomercdir)/gnomerc; then \
79- $(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; \
80- fi
81-
82- if test '!' -d $(authdir); then \
83- $(mkinstalldirs) $(authdir); \
84- chown gdm.gdm $(authdir); \
85- chmod 750 $(authdir); \
86- fi
87+ $(mkinstalldirs) $(DESTDIR)$(confdir) $(DESTDIR)$(localedir) \
88+ $(DESTDIR)$(sessdir) $(DESTDIR)$(initdir) \
89+ $(DESTDIR)$(predir) $(DESTDIR)$(postdir) \
90+ $(DESTDIR)$(gnomercdir) $(DESTDIR)$(localstatedir)/gdm
91+
92+ $(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/gdm.conf; \
93+ $(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf
94+ $(INSTALL_DATA) locale.alias $(DESTDIR)$(localedir)
95+ $(INSTALL_SCRIPT) XKeepsCrashing Xsession Gnome $(DESTDIR)$(confdir)
96+ $(INSTALL_SCRIPT) Xsession Gnome $(DESTDIR)$(sessdir)
97+ $(INSTALL_SCRIPT) Default $(DESTDIR)$(initdir)
98+ $(INSTALL_SCRIPT) PreSession $(DESTDIR)$(predir)/Default
99+ $(INSTALL_SCRIPT) PostSession $(DESTDIR)$(postdir)/Default
100+ $(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc
09f48ad9 101+ (echo "#!/bin/sh"; echo; echo "exec $(sessdir)/Xsession") > Default.pld
102+ $(INSTALL_SCRIPT) Default.pld $(DESTDIR)$(sessdir)/Default
155c899b 103+
104+ chown gdm $(DESTDIR)$(authdir) || :
105+ chogrp gdm $(DESTDIR)$(authdir) || :
106+ chmod 750 $(DESTDIR)$(authdir)
107
108 system=`uname`; \
109 if test -f /usr/include/security/pam_appl.h; then \
09f48ad9 110@@ -124,6 +65,6 @@
155c899b 111 $(INSTALL_DATA) gdm-autologin $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; \
112 fi; \
113 if test $$system = SunOS; then \
114- echo "Please add PAM authentication for gdm and gdm-autologin in $(PAM_PREFIX)/pam.conf!"; \
115+ echo "Please add PAM authentication for gdm and gdm-autologin in $(DESTDIR)$(PAM_PREFIX)/pam.conf!"; \
116 fi; \
117 fi
09f48ad9 118diff -u -r gdm-2.2.5.4/daemon/Makefile.am gdm-2.2.5.4.new/daemon/Makefile.am
119--- gdm-2.2.5.4/daemon/Makefile.am Wed Dec 5 01:24:16 2001
120+++ gdm-2.2.5.4.new/daemon/Makefile.am Sun Oct 27 13:01:00 2002
155c899b 121@@ -1,9 +1,6 @@
122 ## Process this file with automake to produce makefile.in
123-CFLAGS = @CFLAGS@ -g -Wall \
124- -Wpointer-arith \
125- -Wmissing-prototypes -Wmissing-declarations
126
127-DEFS = @DEFS@ -DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\"
128+DEFS = @DEFS@ -DGDM_CONFIG_FILE=\"$(sysconfdir)/gdm/gdm.conf\"
129
130 INCLUDES = \
131 -I. \
09f48ad9 132diff -u -r gdm-2.2.5.4/docs/sgmldocs.make gdm-2.2.5.4.new/docs/sgmldocs.make
133--- gdm-2.2.5.4/docs/sgmldocs.make Fri Aug 24 09:18:15 2001
134+++ gdm-2.2.5.4.new/docs/sgmldocs.make Sun Oct 27 13:01:00 2002
155c899b 135@@ -58,7 +58,7 @@
136 -cp $(docname)/index.html .
137
138 $(docname).sgml: $(sgml_ents)
139- -ourdir=`pwd`; \
140+ ourdir=`pwd`; \
141 cd $(srcdir); \
142 cp $(sgml_ents) $$ourdir
143
GNOME Display Manager
This page took 0.071077 seconds and 4 git commands to generate.