| 1 |
commit: 4ea5cb935d21c3575995b69d838ca884f2f6d63f |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 30 13:30:57 2015 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 30 13:31:02 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/dev/aballier.git/commit/?id=4ea5cb93 |
| 7 |
|
| 8 |
Make .extraebuild mandatory to take advantage of make dependencies |
| 9 |
Remove trailing whitespaces. |
| 10 |
|
| 11 |
scripts/texlive/tlpsrc/Makefile | 15 +++++++++------ |
| 12 |
1 file changed, 9 insertions(+), 6 deletions(-) |
| 13 |
|
| 14 |
diff --git a/scripts/texlive/tlpsrc/Makefile b/scripts/texlive/tlpsrc/Makefile |
| 15 |
index 16bee61..f4b6957 100644 |
| 16 |
--- a/scripts/texlive/tlpsrc/Makefile |
| 17 |
+++ b/scripts/texlive/tlpsrc/Makefile |
| 18 |
@@ -15,7 +15,7 @@ lists : $(FULLDESC:%=%.list) $(FULLDESC:%=%.base) |
| 19 |
|
| 20 |
unpacked : $(FULLDESC:%=%.unpacked) |
| 21 |
|
| 22 |
-%.base: |
| 23 |
+%.base: |
| 24 |
$(CPF) $(@:texlive-%.base=$(TL_TRUNK)/Master/tlpkg/tlpsrc/collection-%.tlpsrc) $@ |
| 25 |
-sh $(@:%.base=%.baseexec) $@ |
| 26 |
|
| 27 |
@@ -104,7 +104,10 @@ clean: |
| 28 |
$(MAKE) CONTENTS="$(shell cat $<)" -f Makefile-dist cataloguehtml |
| 29 |
touch $@ |
| 30 |
|
| 31 |
-%.ebuild: %.desc %.deps %.list %.doclist %.srclist %.gentoolicense |
| 32 |
+%.extraebuild: |
| 33 |
+ touch $@ |
| 34 |
+ |
| 35 |
+%.ebuild: %.desc %.deps %.list %.doclist %.srclist %.gentoolicense %.extraebuild |
| 36 |
cat $(PORTDIR)/header.txt > $@ |
| 37 |
printf "EAPI=\"5\"\n\n" >> $@ |
| 38 |
echo -n "TEXLIVE_MODULE_CONTENTS=\"" >> $@ |
| 39 |
@@ -129,9 +132,9 @@ clean: |
| 40 |
cat $(@:%.ebuild=%.deps) >> $@ |
| 41 |
echo "\"" >> $@ |
| 42 |
echo -n 'RDEPEND="$${DEPEND} ' >> $@ |
| 43 |
- -cat $(@:%.ebuild=%.extrardepend) >> $@ |
| 44 |
+ -cat $(@:%.ebuild=%.extrardepend) >> $@ |
| 45 |
echo '"' >> $@ |
| 46 |
- -cat $(@:%.ebuild=%.extraebuild) >> $@ |
| 47 |
+ cat $(@:%.ebuild=%.extraebuild) >> $@ |
| 48 |
|
| 49 |
dist: lists $(VERSIONNED_ZIPS) $(EXTRA_DIST:%=%.doclist) $(EXTRA_DIST:%=%.srclist) |
| 50 |
$(MAKE) CONTENTS="$(EXTRA_ZIP)" -f Makefile-dist versionnedzips |
| 51 |
@@ -143,9 +146,9 @@ ebuildsdir: |
| 52 |
|
| 53 |
ebuilds: dist $(DESC:%=%.desc) $(DESC:%=%.ebuild) $(DESC:%=%.deps) |
| 54 |
|
| 55 |
-tlpobj: $(DESC:%=%.tlpobj) |
| 56 |
+tlpobj: $(DESC:%=%.tlpobj) |
| 57 |
|
| 58 |
-tlpobj: $(DESC:%=%.tlplic) |
| 59 |
+tlpobj: $(DESC:%=%.tlplic) |
| 60 |
|
| 61 |
licenselist: $(DESC:%=%.licenselist) $(EXTRA_DIST:%=%.licenselist) |
Archives