Subversion Repositories

?revision_form?Rev ?revision_input??revision_submit??revision_endform?

Rev 62 | Rev 88 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 62 Rev 84
Line 3... Line 3...
3
##
3
##
4
## All lines beginning with `## DP:' are a description of the patch.
4
## All lines beginning with `## DP:' are a description of the patch.
5
## DP: Add local site-pike directories to master.pike.in
5
## DP: Add local site-pike directories to master.pike.in
6
6
7
@DPATCH@
7
@DPATCH@
8
diff -urNad trunk~/lib/master.pike.in trunk/lib/master.pike.in
8
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/lib/master.pike.in trunk/lib/master.pike.in
9
--- trunk~/lib/master.pike.in	2007-01-01 01:28:04.000000000 +0100
9
--- trunk~/lib/master.pike.in	2009-09-19 12:08:35.000000000 +0200
10
+++ trunk/lib/master.pike.in	2007-10-02 14:04:02.000000000 +0200
10
+++ trunk/lib/master.pike.in	2010-04-11 21:02:58.000000000 +0200
11
@@ -2094,6 +2094,14 @@
11
@@ -2094,6 +2094,12 @@
12
   add_module_path("#lib_prefix#/modules");
12
   add_module_path("#lib_prefix#/modules");
13
 #endif
13
 #endif
14
 
14
 
15
+  // Debian paths
15
+  // Debian paths
16
+  add_include_path("/usr/local/include/pike");
16
+  add_include_path("/usr/local/lib/pike/include");
17
+  add_include_path("/usr/local/include/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__);
17
+  add_include_path("/usr/local/lib/pike"+__REAL_VERSION__)+"/include";
18
+  add_module_path("/usr/local/lib/pike/site_pike");
18
+  add_module_path("/usr/local/lib/pike/modules");
19
+  add_module_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike");
19
+  add_module_path("/usr/local/lib/pike"+__REAL_VERSION__+"/modules");
20
+  add_module_path("/usr/local/share/pike/site_pike");
-
 
21
+  add_module_path("/usr/local/share/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/site_pike");
-
 
22
+
20
+
23
 #if "#cflags# "[0]!='#'
21
 #if "#cflags# "[0]!='#'
24
   cflags = "#cflags#";
22
   cflags = "#cflags#";
25
 #endif
23
 #endif
-
 
24
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/lib/modules/Tools.pmod/Standalone.pmod/module.pike trunk/lib/modules/Tools.pmod/Standalone.pmod/module.pike
-
 
25
--- trunk~/lib/modules/Tools.pmod/Standalone.pmod/module.pike	2008-07-08 14:59:17.000000000 +0200
-
 
26
+++ trunk/lib/modules/Tools.pmod/Standalone.pmod/module.pike	2010-04-11 21:35:20.000000000 +0200
-
 
27
@@ -25,9 +25,8 @@
-
 
28
 // this is not the ideal location for all systems, but it's a start.
-
 
29
 string local_module_path=combine_path(getenv("HOME")||"","lib/pike/modules");
-
 
30
 bool old_style_module = false;
-
 
31
-// we prefer the last element, because if there are more than one
-
 
32
-// master() puts the lib/modules path last.
-
 
33
-string system_module_path=master()->system_module_path[-1];
-
 
34
+
-
 
35
+string system_module_path="/usr/local/lib/pike"+__REAL_VERSION__+"/modules";
-
 
36
 
-
 
37
 // where do we install the documentation?
-
 
38
 string system_doc_path = master()->doc_prefix;
-
 
39
@@ -183,7 +182,7 @@
-
 
40
     extra_args = ({
-
 
41
       "PIKE="+run_pike,
-
 
42
       "SRCDIR="+fix("$src"),
-
 
43
-      "MODULE_INSTALL_DIR="+combine_path(__FILE__,"../../.."),
-
 
44
+      "MODULE_INSTALL_DIR="+system_module_path,
-
 
45
       "LOCAL_MODULE_PATH=" + lmp,
-
 
46
     });
-
 
47
   }
-
 
48
@@ -240,6 +239,7 @@
-
 
49
     ({"all",Getopt.NO_ARG,({"--all"}) }),
-
 
50
     ({"make",Getopt.NO_ARG,({"--make"}) }),
-
 
51
     ({"auto",Getopt.NO_ARG,({"--auto"}) }),
-
 
52
+    ({"debian",Getopt.NO_ARG,({"--debian"}) }),
-
 
53
     ({"source",Getopt.HAS_ARG,({"--source"}) }),
-
 
54
     ({"query",Getopt.HAS_ARG,({"--query"}) }),
-
 
55
     ({"config_args",Getopt.HAS_ARG,({"--configure-args"}) }),
-
 
56
@@ -276,6 +276,9 @@
-
 
57
 	case "auto":
-
 
58
 	  run->depend=run->autoheader=run->autoconf=run->configure=run->make=AUTO;
-
 
59
 	  break;
-
 
60
+
-
 
61
+	case "debian":
-
 
62
+	  system_module_path=master()->system_module_path[-1];
-
 
63
       }
-
 
64
     }
-
 
65
 
-
 
66
@@ -405,7 +408,7 @@
-
 
67
 	  run_or_fail( ([ "env":getenv()|
-
 
68
 			  ([
-
 
69
 			    "PIKE":run_pike,
-
 
70
-			    "MODULE_INSTALL_DIR":combine_path(__FILE__,"../../.."),
-
 
71
+			    "MODULE_INSTALL_DIR":system_module_path,
-
 
72
 			    "LOCAL_MODULE_PATH":local_module_path,
-
 
73
 			  ])
-
 
74
 		       ]),
-
 
75
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/src/modules/dynamic_module_makefile.in trunk/src/modules/dynamic_module_makefile.in
-
 
76
--- trunk~/src/modules/dynamic_module_makefile.in	2008-01-11 01:22:27.000000000 +0100
-
 
77
+++ trunk/src/modules/dynamic_module_makefile.in	2010-04-11 22:37:28.000000000 +0200
-
 
78
@@ -90,13 +90,13 @@
-
 
79
 #
-
 
80
 install: $(MODULE_INSTALL)
-
 
81
 	@if test "x$(OBJS)" != "x" ; then \
-
 
82
-	  $(TMP_BINDIR)/install_module module.so $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX)$(MODNAME).so && \
-
 
83
+	  $(TMP_BINDIR)/install_module module.so $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX)$(MODNAME).so && \
-
 
84
 	  if [ -f $(MODNAME).pdb ]; then \
-
 
85
-	    cp $(MODNAME).pdb $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX); \
-
 
86
+	    cp $(MODNAME).pdb $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX); \
-
 
87
 	  else :; fi; \
-
 
88
 	fi; \
-
 
89
 	if test "x$(MODULE_PMOD_IN)" != "x"; then \
-
 
90
-	  $(TMP_BINDIR)/install_module module.pmod $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODNAME).pmod ;\
-
 
91
+	  $(TMP_BINDIR)/install_module module.pmod $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODNAME).pmod ;\
-
 
92
 	fi;
-
 
93
 
-
 
94
 #