summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-05-19 02:32:29 -0400
committermidipix <writeonce@midipix.org>2016-05-19 02:36:21 -0400
commit990ef343fab3da29230dc3cbc78ee12237f99594 (patch)
tree9967141b38d9bc462f03054fe4165df97b0c37e3
parenteef5ed3cbaa3229342bbb74ab8e6d2feca005a39 (diff)
downloadslibtool-990ef343fab3da29230dc3cbc78ee12237f99594.tar.bz2
slibtool-990ef343fab3da29230dc3cbc78ee12237f99594.tar.xz
build system: when building from a git repo, explicitly depend on .git/index.
-rw-r--r--Makefile.in4
-rwxr-xr-xconfigure4
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 962fab4..d2479b0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
PACKAGE = @package@
NICKNAME = @nickname@
PROJECT_DIR = @project_dir@
-GIT_REFERENCE_DIR = @git_reference_dir@
+GIT_REFERENCE_INDEX = @git_reference_index@
CUSTOM_INSTALL_HEADERS = @custom_install_headers@
AVOID_VERSION = @avoid_version@
@@ -212,7 +212,7 @@ host.tag: Makefile
$(PROJECT_DIR)/sysinfo/host/host.sh --compiler="$(CC)" --cflags="$(CFLAGS)"
touch host.tag
-version.tag: $(GIT_REFERENCE_DIR)
+version.tag: $(GIT_REFERENCE_INDEX)
$(PROJECT_DIR)/sysinfo/version.sh \
-s $(PROJECT_DIR) \
-o build/$(PACKAGE)_version.h \
diff --git a/configure b/configure
index 4dacc2a..b6f0f48 100755
--- a/configure
+++ b/configure
@@ -30,7 +30,7 @@ init_vars()
# git
if [ -d "$mb_project_dir/.git" ]; then
- mb_git_reference_dir="\$(PROJECT_DIR)/.git"
+ mb_git_reference_index="\$(PROJECT_DIR)/.git/index"
fi
# project
@@ -355,7 +355,7 @@ config_copy()
sed -e 's^@package@^'"$mb_package"'^g' \
-e 's^@nickname@^'"$mb_nickname"'^g' \
-e 's^@project_dir@^'"$mb_project_dir"'^g' \
- -e 's^@git_reference_dir@^'"$mb_git_reference_dir"'^g' \
+ -e 's^@git_reference_index@^'"$mb_git_reference_index"'^g' \
-e 's^@custom_install_headers@^'"$mb_custom_install_headers"'^g' \
-e 's^@avoid_version@^'"$mb_avoid_version"'^g' \
\