View | Details | Raw Unified | Return to bug 240308 | Differences between
and this patch

Collapse All | Expand All

(-)security/fsh/files/patch-Makefile.in (+71 lines)
Line 0 Link Here
1 
--- Makefile.in.orig	2001-12-23 11:10:13 UTC
2 
+++ Makefile.in
3 
@@ -40,7 +40,7 @@ exec_prefix = @exec_prefix@
4
5 
 bindir = @bindir@
6 
 sbindir = @sbindir@
7 
-libexecdir = @libexecdir@
8 
+libexecdir = @ac_libexecdir@
9 
 datadir = @datadir@
10 
 sysconfdir = @sysconfdir@
11 
 sharedstatedir = @sharedstatedir@
12 
@@ -81,7 +81,7 @@ EXEEXT = @EXEEXT@
13 
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
14 
 OBJEXT = @OBJEXT@
15 
 PACKAGE = @PACKAGE@
16 
-PYTHON = @PYTHON@
17 
+PYTHON = @PYTHON_CMD@
18 
 VERSION = @VERSION@
19 
 am__include = @am__include@
20 
 am__quote = @am__quote@
21 
@@ -576,16 +576,16 @@ uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
22
23 
 starter: Makefile $(srcdir)/$(PYTHON_SCRIPT_TEMPLATE)
24 
 	rm -f $@ $@.tmp
25 
-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
26 
-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
27 
+	sed -e 's%@PYTHON@%$(PYTHON)%' \
28 
+	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
29 
 	    < $(srcdir)/$(PYTHON_SCRIPT_TEMPLATE) > $@.tmp
30 
 	mv $@.tmp $@
31
32 
 fsh: fsh.in Makefile starter
33 
 	rm -f $@ $@.tmp
34 
 	cat starter > $@.tmp
35 
-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
36 
-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
37 
+	sed -e 's%@PYTHON@%$(PYTHON)%' \
38 
+	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
39 
 	    < $(srcdir)/fsh.in >> $@.tmp
40 
 	chmod +x $@.tmp
41 
 	mv $@.tmp $@
42 
@@ -593,8 +593,8 @@ fsh: fsh.in Makefile starter
43 
 fshd: fshd.in Makefile starter
44 
 	rm -f $@ $@.tmp
45 
 	cat starter > $@.tmp
46 
-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
47 
-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
48 
+	sed -e 's%@PYTHON@%$(PYTHON)%' \
49 
+	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
50 
 	    < $(srcdir)/fshd.in >> $@.tmp
51 
 	chmod +x $@.tmp
52 
 	mv $@.tmp $@
53 
@@ -602,15 +602,15 @@ fshd: fshd.in Makefile starter
54 
 in.fshd: in.fshd.in Makefile starter
55 
 	rm -f $@ $@.tmp
56 
 	cat starter > $@.tmp
57 
-	sed -e 's%@\PYTHON@%$(PYTHON)%' \
58 
-	    -e 's%@\pkgdatadir@%$(pkgdatadir)%' \
59 
+	sed -e 's%@PYTHON@%$(PYTHON)%' \
60 
+	    -e 's%@pkgdatadir@%$(pkgdatadir)%' \
61 
 	    < $(srcdir)/in.fshd.in >> $@.tmp
62 
 	chmod +x $@.tmp
63 
 	mv $@.tmp $@
64
65 
 fcp: fcp.sh Makefile
66 
 	rm -f $@ $@.tmp
67 
-	sed -e 's%@\libexecdir@%$(libexecdir)%g' \
68 
+	sed -e 's%@libexecdir@%$(libexecdir)%g' \
69 
 	    < $(srcdir)/fcp.sh > $@.tmp
70 
 	chmod +x $@.tmp
71 
 	mv $@.tmp $@
(-)security/fsh/files/patch-configure (+20 lines)
Line 0 Link Here
1 
--- configure.orig	2001-12-23 11:10:13 UTC
2 
+++ configure
3 
@@ -2732,7 +2732,7 @@ s,@prefix@,$prefix,;t t
4 
 s,@program_transform_name@,$program_transform_name,;t t
5 
 s,@bindir@,$bindir,;t t
6 
 s,@sbindir@,$sbindir,;t t
7 
-s,@libexecdir@,$libexecdir,;t t
8 
+s,@ac_libexecdir@,$libexecdir,;t t
9 
 s,@datadir@,$datadir,;t t
10 
 s,@sysconfdir@,$sysconfdir,;t t
11 
 s,@sharedstatedir@,$sharedstatedir,;t t
12 
@@ -2778,7 +2778,7 @@ s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
13 
 s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
14 
 s,@DEPDIR@,$DEPDIR,;t t
15 
 s,@DEFAULT_FSHD_TIMEOUT@,$DEFAULT_FSHD_TIMEOUT,;t t
16 
-s,@PYTHON@,$PYTHON,;t t
17 
+s,@PYTHON_CMD@,$PYTHON,;t t
18 
 s,@PYTHON_SCRIPT_TEMPLATE@,$PYTHON_SCRIPT_TEMPLATE,;t t
19 
 s,@CC@,$CC,;t t
20 
 s,@CFLAGS@,$CFLAGS,;t t

Return to bug 240308