diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-15 23:56:04 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-15 23:56:04 +0000 |
| commit | 2f71f5913670cec39345ff4d37c705ddc1adc06d (patch) | |
| tree | b9a91fc423f51f4a8667f4097e907b9806e3e82e | |
| parent | 4cc6dec62b39f729d5333e644e438a9f95bacf7d (diff) | |
| download | s6-linux-utils-2f71f5913670cec39345ff4d37c705ddc1adc06d.tar.gz s6-linux-utils-2f71f5913670cec39345ff4d37c705ddc1adc06d.tar.xz s6-linux-utils-2f71f5913670cec39345ff4d37c705ddc1adc06d.zip | |
Test _XOPEN_SOURCE=700, fix include order in Makefile
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 24 | ||||
| -rw-r--r-- | package/targets.mak | 9 |
3 files changed, 21 insertions, 14 deletions
diff --git a/Makefile b/Makefile index c8ff735..73d9cbb 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,8 @@ it: all CC = $(error Please use ./configure first) -include package/targets.mak -include config.mak +include package/targets.mak include package/deps.mak version_m := $(basename $(version)) diff --git a/configure b/configure index 455559f..0647be0 100755 --- a/configure +++ b/configure @@ -344,9 +344,19 @@ if $allstatic ; then vpathd= fi echo "vpath lib%.so$vpathd" -echo -$static || echo "STATIC_LIBS :=" -$shared || echo "SHARED_LIBS :=" +echo "STATIC_LIBS :=" +echo "SHARED_LIBS :=" +if $static ; then + echo "DO_STATIC := 1" +else + echo "DO_STATIC :=" +fi +if $shared ; then + echo "DO_SHARED := 1" +else + echo "DO_SHARED :=" +fi + exec 1>&3 3>&- echo " ... done." @@ -364,13 +374,13 @@ cat <<EOF #define ${package_macro_name}_VERSION "$version" EOF if $slashpackage ; then - echo "#define ${package_macro_name}_BINPREFIX \"$binprefix\"" - echo "#define ${package_macro_name}_EXTBINPREFIX \"$extbinprefix\"" - echo "#define ${package_macro_name}_LIBEXECPREFIX \"$binprefix\"" + echo "#define ${package_macro_name}_BINPREFIX \"$binprefix/\"" + echo "#define ${package_macro_name}_EXTBINPREFIX \"$extbinprefix/\"" + echo "#define ${package_macro_name}_LIBEXECPREFIX \"$binprefix/\"" else echo "#define ${package_macro_name}_BINPREFIX \"\"" echo "#define ${package_macro_name}_EXTBINPREFIX \"\"" - echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir\"" + echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\"" fi echo echo "#endif" diff --git a/package/targets.mak b/package/targets.mak index 49d5077..a1988cf 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -1,4 +1,4 @@ -BIN_TARGETS = \ +BIN_TARGETS := \ s6-chroot \ s6-devd \ s6-freeramdisk \ @@ -15,8 +15,5 @@ s6-swapoff \ s6-swapon \ s6-umount \ -SBIN_TARGETS = -LIBEXEC_TARGETS = - -SHARED_LIBS = -STATIC_LIBS = +SBIN_TARGETS := +LIBEXEC_TARGETS := |