diff options
| author | Paul Buetow (mars.fritz.box) <paul@buetow.org> | 2013-12-29 15:16:51 +0100 |
|---|---|---|
| committer | Paul Buetow (mars.fritz.box) <paul@buetow.org> | 2013-12-29 15:16:51 +0100 |
| commit | e39778d8ca739070f3284b71b0d6d119972235fa (patch) | |
| tree | d25ac2594f2d37fccd061cd541df847eeae602b0 /Makefile | |
| parent | 1d3016a3800530f2de56b787643ef4550d09f5ba (diff) | |
| parent | 14250af451c56b00f9e94d7b27dc24465d954a81 (diff) | |
merge
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -16,6 +16,7 @@ deinstall: test ! -z "$(DESTDIR)" && test -d $(DESTDIR)/usr/share/$(NAME) && rm -r $(DESTDIR)/usr/share/$(NAME) || exit 0 test ! -z "$(DESTDIR)" && test -f $(DESTDIR)/etc/default/photoalbum && rm $(DESTDIR)/etc/default/photoalbum || exit 0 clean: +<<<<<<< HEAD test -d ./bin && rm -Rf ./bin || exit 0 test -d ./debian/photoalbum && rm -Rf ./debian/photoalbum || exit 0 version: @@ -42,3 +43,6 @@ clean-top: rm ../$(NAME)_*.changes rm ../$(NAME)_*.deb +======= + sh -c 'rm -Rf dist *.tar; exit 0' +>>>>>>> 14250af451c56b00f9e94d7b27dc24465d954a81 |