Subversion Repositories

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

Rev 88 | Details | Compare with Previous | Last modification | View Log | RSS feed

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