Subversion Repositories

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

Rev 116 | Rev 181 | Go to most recent revision | Details | Compare with Previous | Last modification | View Log | RSS feed

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