From 6e0197b8997c63c952f3cc55ebcfadab83002d83 Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Sat, 18 Apr 1998 14:04:17 +0200
Subject: [PATCH] /share/ bugfix
Rev: lib/master.pike.in:1.13
Rev: src/Makefile.in:1.79
---
lib/master.pike.in | 3 +--
src/Makefile.in | 11 +++++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/master.pike.in b/lib/master.pike.in
index a1e0846ad1..e73902eefa 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -1,4 +1,4 @@
-/* $Id: master.pike.in,v 1.12 1998/04/18 06:28:09 hubbe Exp $
+/* $Id: master.pike.in,v 1.13 1998/04/18 12:04:17 mirar Exp $
*
* Master-file for Pike.
*
@@ -506,7 +506,6 @@ void _main(string *orig_argv, string *env)
add_constant("write",_static_modules.files()->_stdout->write);
-
// add path for architecture-shared files
add_include_path("�share_prefix�/include");
add_module_path("�share_prefix�/modules");
diff --git a/src/Makefile.in b/src/Makefile.in
index aea9eb0925..6c4a1653ed 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.in,v 1.78 1998/04/18 06:28:50 hubbe Exp $
+# $Id: Makefile.in,v 1.79 1998/04/18 12:04:16 mirar Exp $
#
# This line is needed on some machines.
@@ -25,7 +25,7 @@ TMP_LIBDIR = $(TMP_BUILDDIR)/lib
prefix = @prefix@
exec_prefix = $(prefix)/bin
lib_prefix = $(prefix)/lib/pike
-share_prefix = @datadir@
+share_prefix = @datadir@/pike
#
# use bison please, yacc isn't good enough.
@@ -355,8 +355,11 @@ lib: $(LIBDIR_SRC)/master.pike.in Makefile
ln -s "$(LIBDIR_SRC)" ./share || exit 1; \
fi
@echo "Creating lib/master.pike"; \
- ( sed -e 's!�lib_prefix�!$(lib_prefix)!' <$(LIBDIR_SRC)/master.pike.in \
- | sed -e 's!�share_prefix�!$(share_prefix)!' >./lib/master.pike && chmod 644 ./lib/master.pike) || exit 1
+ ( sed -e 's!�exec_prefix�!$(exec_prefix)!' \
+ -e 's!�lib_prefix�!$(lib_prefix)!' \
+ -e 's!�data_prefix�!$(share_prefix)!' \
+ <$(LIBDIR_SRC)/master.pike.in \
+ >./lib/master.pike && chmod 644 ./lib/master.pike) || exit 1
@echo "Done."
-@touch ./lib 2>/dev/null || (touch lib/.broken_gnu_touch && rm lib/.broken_gnu_touch)
--
GitLab