Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
nerrons
purr-data
Commits
f7238f54
Commit
f7238f54
authored
Mar 09, 2018
by
Albert Gräf
Browse files
Remove patch to packages Makefile from debuild, it's not needed any more.
parent
df7f0838
Changes
2
Hide whitespace changes
Inline
Side-by-side
debuild/Makefile
View file @
f7238f54
...
...
@@ -113,9 +113,6 @@ $(debsrc):
# Pre-generate and put s_stuff.h into the tarball (see above; the build
# version is generated using git which can't be done outside the git repo).
sed
's|^\(#define PD_BUILD_VERSION "\).*"|\1$(PD_BUILD_VERSION)"|'
../pd/src/s_stuff.h.in
>
$(debdist)/pd/src/s_stuff.h
# Patch packages/Makefile so that we do *not* try to regenerate s_stuff.h
# during the build.
cd
$(debdist)
&&
patch
-p1
<
../packages-Makefile.patch
# Create the source tarball.
tar
cfz
$(debsrc)
$(debdist)
rm
-rf
$(debdist)
...
...
debuild/packages-Makefile.patch
deleted
100644 → 0
View file @
df7f0838
diff --git a/packages/Makefile b/packages/Makefile
index a360dba7..b5b949b5 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -377,7 +377,7 @@
doc_format:
# from the latter by substituting PD_BUILD_VERSION.
git_version: $(pd_src)/src/s_stuff.h.in
- @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 && \
(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))
@@ -422,7 +422,7 @@
distclean: cruft_clean
$(MAKE) -C $(abstractions_src) distclean
$(MAKE) -C $(extensions_src) distclean
$(MAKE) -C $(externals_src) distclean
- -$(MAKE) -C $(pd_src) distclean
+ -$(MAKE) -C $(pd_src) clean
test_locations:
@echo "PD_VERSION: $(PD_VERSION)"
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment