From e81f61fa9aefe2f3c76ee27dd1071635e092b73a Mon Sep 17 00:00:00 2001 From: midipix Date: Dec 25 2018 06:53:29 +0000 Subject: build system: create the ``build'' directory via the dirs.tag make target. --- 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" \