Skip to content
Snippets Groups Projects
Commit bd3eeb8e authored by Albert Gräf's avatar Albert Gräf
Browse files

Update debuild

parent dfb3a0f8
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !172. Comments created here will be created in the context of that merge request.
diff --git a/packages/Makefile b/packages/Makefile diff --git a/packages/Makefile b/packages/Makefile
index f5c1f8c0..0a285b52 100644 index a360dba7..b5b949b5 100644
--- a/packages/Makefile --- a/packages/Makefile
+++ b/packages/Makefile +++ b/packages/Makefile
@@ -373,12 +373,14 @@ doc_format: @@ -377,7 +377,7 @@ doc_format:
# AG: The set_version target is broken since it modifies m_pd.h in-place # from the latter by substituting PD_BUILD_VERSION.
# during the build, which is a bad thing to do to files which are supposed to
# be kept in a source code repository. Instead, we create s_stuff.h from
-# s_stuff.h.in, where the latter is kept in the repo and the former gets created
-# from the latter by substituting PD_BUILD_VERSION.
+# s_stuff.h.in, where the latter is kept in the repo and the former gets
+# created from the latter by substituting PD_BUILD_VERSION. (Only try to do
+# this if we're actually in the git repo, otherwise we'll get an empty
+# revision number.)
git_version: $(pd_src)/src/s_stuff.h.in git_version: $(pd_src)/src/s_stuff.h.in
- cd $(pd_src)/src/ && \ - @cd $(pd_src)/src/ && \
- sed 's|^\(#define PD_BUILD_VERSION "\).*"|\1$(PD_BUILD_VERSION)"|' s_stuff.h.in > s_stuff.h + @test -d $(cvs_root_dir)/.git && cd $(pd_src)/src/ && \
+ test -d $(cvs_root_dir)/.git && cd $(pd_src)/src/ && \ sed 's|^\(#define PD_BUILD_VERSION "\).*"|\1$(PD_BUILD_VERSION)"|' s_stuff.h.in > s_stuff.h.new && \
+ sed 's|^\(#define PD_BUILD_VERSION "\).*"|\1$(PD_BUILD_VERSION)"|' s_stuff.h.in > s_stuff.h || true (test -f s_stuff.h && diff -q s_stuff.h s_stuff.h.new > /dev/null && rm -f s_stuff.h.new && echo s_stuff.h unchanged || (rm -f s_stuff.h && mv s_stuff.h.new s_stuff.h))
set_version: @@ -422,7 +422,7 @@ distclean: cruft_clean
# change Pd's version number to reflect the extended build
@@ -421,7 +423,7 @@ distclean: cruft_clean
$(MAKE) -C $(abstractions_src) distclean $(MAKE) -C $(abstractions_src) distclean
$(MAKE) -C $(extensions_src) distclean $(MAKE) -C $(extensions_src) distclean
$(MAKE) -C $(externals_src) distclean $(MAKE) -C $(externals_src) distclean
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment