summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL2
-rw-r--r--Makefile4
-rw-r--r--doc/index.html2
-rw-r--r--package/deps.mak2
-rwxr-xr-xtools/gen-deps.sh4
5 files changed, 7 insertions, 7 deletions
diff --git a/INSTALL b/INSTALL
index 197c384..c93d004 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@ Build Instructions
------------
- A Linux-based system with a standard C development environment
- - GNU make version 4.0 or later
+ - GNU make version 3.81 or later
- skalibs version 2.3.7.1 or later: http://skarnet.org/software/skalibs/
- execline version 2.1.4.1 or later: http://skarnet.org/software/execline/
- s6-portable-utils version 2.0.5.3 or later: http://skarnet.org/software/s6-portable-utils/
diff --git a/Makefile b/Makefile
index 6eba87f..c3b4a4a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
it: all
-make_need := 4.0
+make_need := 3.81
ifeq "" "$(strip $(filter $(make_need), $(firstword $(sort $(make_need) $(MAKE_VERSION)))))"
fail := $(error Your make ($(MAKE_VERSION)) is too old. You need $(make_need) or newer)
endif
@@ -20,7 +20,7 @@ INTERNAL_LIBS :=
EXTRA_TARGETS :=
LIB_DEFS :=
-define library_definition =
+define library_definition
LIB$(firstword $(subst =, ,$(1))) := lib$(lastword $(subst =, ,$(1))).$(if $(DO_ALLSTATIC),a,so).xyzzy
ifdef DO_SHARED
SHARED_LIBS += lib$(lastword $(subst =, ,$(1))).so.xyzzy
diff --git a/doc/index.html b/doc/index.html
index b63a409..260b286 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -48,7 +48,7 @@ a small FAQ.
<ul>
<li> A Linux-based system with a standard C development environment </li>
- <li> GNU make, version 4.0 or later </li>
+ <li> GNU make, version 3.81 or later </li>
<li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
2.3.7.1 or later </li>
<li> <a href="http://skarnet.org/software/execline/">execline</a> version
diff --git a/package/deps.mak b/package/deps.mak
index 5e669fe..f1fb7db 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -4,5 +4,5 @@
src/init/s6-linux-init-maker.o src/init/s6-linux-init-maker.lo: src/init/s6-linux-init-maker.c
-s6-linux-init-maker: private EXTRA_LIBS :=
+s6-linux-init-maker: EXTRA_LIBS :=
s6-linux-init-maker: src/init/s6-linux-init-maker.o -lskarnet
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index f8cf5ee..5c96dd1 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -66,7 +66,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
fi
done < src/$dir/deps-lib/$file
echo "lib${file}.a.xyzzy:$deps"
- echo "lib${file}.so.xyzzy: private EXTRA_LIBS :=$libs"
+ echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
done
@@ -83,7 +83,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
deps="$deps $dep"
fi
done < src/$dir/deps-exe/$file
- echo "$file: private EXTRA_LIBS :=$libs"
+ echo "$file: EXTRA_LIBS :=$libs"
echo "$file: src/$dir/$file.o$deps"
done
done