Subversion Repositories

Author: Magnus Holmgren <holmgren@debian.org>
Description: Allow share_prefix to be separately overridden in install.pike

diff -urNad pike7.8-7.8.116~/src/Makefile.in pike7.8-7.8.116/src/Makefile.in
--- pike7.8-7.8.116~/src/Makefile.in    2008-11-18 15:16:56.000000000 -0400
+++ pike7.8-7.8.116/src/Makefile.in     2009-05-04 21:50:17.000000000 -0300
@@ -57,7 +57,7 @@
 # TESTARGS = -F -a
 
 # Arguments for install.pike used by the install targets.
-INSTALLARGS = --new-style
+INSTALLARGS ?= --new-style
 
 #
 # use bison please, yacc isn't good enough.
@@ -658,7 +658,7 @@
        man_prefix="$(man_prefix)" pike_name=$(pike_name) \
        fakeroot="$(buildroot)" PIKE_MODULE_RELOC="$(PIKE_MODULE_RELOC)" \
        cflags="@DYNAMIC_MODULE_FLAGS@" ldflags="" \
-       $(INSTALLARGS)
+       share_prefix="$(share_prefix)" $(INSTALLARGS)
 
 install_interactive: pike-complete-stamp tools
        @$(RUNPIKE) $(TMP_BINDIR)/install.pike --interactive \
--- a/bin/install.pike  2009-06-08 23:51:36.000000000 +0200
+++ b/bin/install.pike  2009-08-22 15:46:55.000000000 +0200
@@ -1904,6 +1904,7 @@
 string exec_prefix;
 string lib_prefix;
 string include_prefix;
+string share_prefix;
 string doc_prefix;
 string man_prefix;
 string cflags;
@@ -1946,6 +1947,8 @@
       lib_prefix=vars->lib_prefix||(prefix+"/lib/pike/");
       include_prefix =
        vars->include_prefix || combine_path(prefix,"include","pike");
+      share_prefix =
+       vars->share_prefix || lib_prefix;
       doc_prefix =
        vars->doc_prefix || combine_path(prefix, "doc", "pike");
       man_prefix=vars->man_prefix||(prefix+"/share/man/");
@@ -2128,7 +2131,7 @@
     lib_prefix = combine_path(prefix, "lib");
     include_prefix = combine_path(prefix,"include","pike");
     make_master("lib/master.pike", "lib/master.pike.in",
-               lib_prefix, include_prefix, UNDEFINED, cflags, ldflags);
+               lib_prefix, include_prefix, share_prefix, cflags, ldflags);
     status1("Installing master done.");
     return 0;
 
@@ -2853,10 +2856,10 @@
     }
     else
       make_master(combine_path(vars->TMP_LIBDIR,"master.pike"), master_src,
-                 lib_prefix, include_prefix, UNDEFINED, cflags, ldflags);
+                 lib_prefix, include_prefix, share_prefix, cflags, ldflags);
 
     install_dir(vars->TMP_LIBDIR,lib_prefix,1);
-    install_dir(vars->LIBDIR_SRC,lib_prefix,1);
+    install_dir(vars->LIBDIR_SRC,share_prefix,1);
 
     install_header_files(vars->SRCDIR,include_prefix);
     install_header_files(combine_path(vars->SRCDIR,"code"),