summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2018-12-25 01:50:06 -0500
committermidipix <writeonce@midipix.org>2018-12-25 01:53:27 -0500
commit01f474cea824f56a42efe193a83f7ad19e35ecb7 (patch)
tree1ea17a50a36150699b73ce78cc82d769b69fab29
parent35a21f2a83aed46dc401f354ea10f7658f29e3ff (diff)
downloadntcon-01f474cea824f56a42efe193a83f7ad19e35ecb7.tar.bz2
ntcon-01f474cea824f56a42efe193a83f7ad19e35ecb7.tar.xz
build system: create the ``build'' directory via the dirs.tag make target.
-rw-r--r--Makefile.in3
-rw-r--r--sofort/pkgconf.mk2
-rwxr-xr-xsysinfo/version.sh5
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index e91fe9e..01d7caa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -254,6 +254,7 @@ $(STATIC_APP): $(STATIC_OBJS) $(APP_OBJS)
dirs: dirs.tag
dirs.tag:
+ mkdir -p build
mkdir -p bin
mkdir -p lib
touch dirs.tag
@@ -262,7 +263,7 @@ host.tag: Makefile
$(CC) $(CFLAGS) -dumpmachine > host.tmp
mv host.tmp host.tag
-version.tag: $(GIT_REFERENCE_INDEX)
+version.tag: $(GIT_REFERENCE_INDEX) dirs.tag
$(PROJECT_DIR)/sysinfo/version.sh \
-s $(SOURCE_DIR) \
-o build/$(PACKAGE)_version.h \
diff --git a/sofort/pkgconf.mk b/sofort/pkgconf.mk
index 59a54e0..c8fc711 100644
--- a/sofort/pkgconf.mk
+++ b/sofort/pkgconf.mk
@@ -6,7 +6,7 @@ else
PKGCONF_VERSION = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
-build/$(PACKAGE).pc: .pkgconf
+build/$(PACKAGE).pc: .pkgconf dirs.tag
build/$(PACKAGE).pc:
@touch $@
diff --git a/sysinfo/version.sh b/sysinfo/version.sh
index a9e5992..02dd5d5 100755
--- a/sysinfo/version.sh
+++ b/sysinfo/version.sh
@@ -59,11 +59,10 @@ cvdate=$(git show -s --format=%ci $gitver)
vmacro=$(printf '%s' "$prefix"'_GIT_VERSION' | tr '[:lower:]' '[:upper:]')
dmacro=$(printf '%s' "$prefix"'_GIT_DATE ' | tr '[:lower:]' '[:upper:]')
-
-# three
cd "$workdir"
-mkdir -p $(dirname "$output")
+
+# three
printf '#define %s "%s"\n#define %s "%s"\n' \
"$vmacro" "$gitver" \
"$dmacro" "$cvdate" \