summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPaul Buetow (mars.fritz.box) <paul@buetow.org>2013-12-29 15:18:26 +0100
committerPaul Buetow (mars.fritz.box) <paul@buetow.org>2013-12-29 15:18:26 +0100
commitd7b587260afd58ac498573c4e64c697b62ea5daa (patch)
treeed2d4c6ee041c40b8207f5f93182d6103c194fc7 /Makefile
parente39778d8ca739070f3284b71b0d6d119972235fa (diff)
There is no hunting like the hunting of man, and those who have hunted0.1.0
armed men long enough and liked it, never care for anything else thereafter. -- Ernest Hemingway
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index eb8fba6..e89e992 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ 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:
@@ -43,6 +42,3 @@ clean-top:
rm ../$(NAME)_*.changes
rm ../$(NAME)_*.deb
-=======
- sh -c 'rm -Rf dist *.tar; exit 0'
->>>>>>> 14250af451c56b00f9e94d7b27dc24465d954a81