Skip to content

Commit 5eae5b7

Browse files
author
Juergen Weigert
committed
cp -a fails with fakeroot. use cp -r instead.
1 parent 6210d22 commit 5eae5b7

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

Makefile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
# a simple makefile to pull a tar ball.
22

3-
TARNAME=inkscape-silhouette
3+
PREFIX?=/usr
4+
DISTNAME=inkscape-silhouette
45
EXCL=--exclude \*.orig --exclude \*.pyc
56
ALL=README.md *.png *.sh *.rules *.py *.inx examples misc silhouette
6-
VERS=$$(echo '<xml height="0"/>' | python ./sendto_silhouette.py --version)
7+
VERS=$$(echo '<xml height="0"/>' | python ./sendto_silhouette.py --version /dev/stdin)
78

8-
DEST=/usr/share/inkscape/extensions
9+
DEST=$(DESTDIR)$(PREFIX)/share/inkscape/extensions
910

1011
dist:
1112
cd distribute; sh ./distribute.sh
1213

1314
#install is used by dist.
1415
install:
15-
echo this does not work under fakeroot.
1616
mkdir -p $(DEST)
17-
cp -a silhouette $(DEST)
17+
# CAUTION: cp -a does not work under fakeroot. Use cp -r instead.
18+
cp -r silhouette $(DEST)
1819
install -m 755 -t $(DEST) *.py
1920
install -m 644 -t $(DEST) *.inx
2021

2122

2223
tar_dist_classic: clean
23-
name=$(TARNAME)-$(VERS); echo "$$name"; echo; \
24+
name=$(DISTNAME)-$(VERS); echo "$$name"; echo; \
2425
tar jcvf $$name.tar.bz2 $(EXCL) --transform="s,^,$$name/," $(ALL)
2526
grep about_version ./sendto_silhouette.inx
2627
@echo version should be $(VERS)
@@ -32,3 +33,5 @@ tar_dist:
3233

3334
clean:
3435
rm -f *.orig */*.orig
36+
rm -rf distribute/$(DISTNAME)
37+
rm -rf distribute/deb/files

sendto_silhouette.inx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<page name='about' _gui-text='About'>
6666
<param name="about_who" type="description">inkscape-silhouette extension from https://github.com/jnweiger/inkscape-silhouette by Jürgen Weigert [juewei@fabmail.org]</param>
6767
<!-- Keep in sync with sendto_silhouette.py line 103 __version__ = ... -->
68-
<param name="about_version" type="description">Version 1.14</param>
68+
<param name="about_version" type="description">Version 1.15</param>
6969
</page>
7070
</param>
7171

0 commit comments

Comments
 (0)