X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=5e4dbe68c0308bf1b385c84e94d808d4f740b625;hp=8a8cd4342554f18cc05ca70c3f31a830e2a17e79;hb=40b1bbc50682effec5cf18b0923cfab24e154245;hpb=4d067435b1167dbf5217c875ac9fd7ac69ad91bd

diff --git a/Makefile.real b/Makefile.real
index 8a8cd434..5e4dbe68 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -9,7 +9,6 @@ endif
 
 vardir := /var/paraslash
 mandir := $(datarootdir)/man/man1
-STRIP := $(CROSS_COMPILE)strip
 MKDIR_P := mkdir -p
 prefixed_executables := $(addprefix para_, $(executables))
 
@@ -63,10 +62,11 @@ tarball_pfx := $(PACKAGE_TARNAME)-$(GIT_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
 tarball := $(tarball_pfx).tar.bz2
 
-.PHONY: all clean clean2 distclean maintainer-clean install man tarball
 all: $(prefixed_executables) $(man_pages)
+.PHONY: all mostlyclean clean distclean maintainer-clean install \
+	install-strip man dist tarball
+
 man: $(man_pages)
-tarball: $(tarball)
 
 include $(m4_ggo_dir)/makefile
 include $(test_dir)/makefile.test
@@ -335,31 +335,36 @@ $(prefixed_executables):
 	@[ -z "$(Q)" ] || echo 'LD $@'
 	$(Q) $(CC) $^ -o $@ $(LDFLAGS)
 
-clean:
-	@[ -z "$(Q)" ] || echo 'CLEAN'
+mostlyclean:
+	@[ -z "$(Q)" ] || echo 'MOSTLYCLEAN'
 	$(Q) rm -f para_*
 	$(Q) rm -rf $(object_dir)
-
-clean2: clean
-	@[ -z "$(Q)" ] || echo 'CLEAN2'
+clean: mostlyclean
+	@[ -z "$(Q)" ] || echo 'CLEAN'
 	$(Q) rm -rf $(build_dir)
-distclean: clean2 test-clean
+distclean: clean
 	@[ -z "$(Q)" ] || echo 'DISTCLEAN'
 	$(Q) rm -f Makefile autoscan.log config.status config.log
-	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
-
+	$(Q) rm -f config.h configure config.h.in
 maintainer-clean: distclean
 	@[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN'
-	$(Q) rm -f *.tar.bz2 config.h configure config.h.in
+	$(Q) rm -f *.tar.bz2
+	$(Q) rm -f GPATH GRTAGS GSYMS GTAGS
+
+INSTALL ?= install
+INSTALL_PROGRAM ?= $(INSTALL)
+INSTALL_DATA ?= $(INSTALL) -m 644
+ifneq ($(findstring strip, $(MAKECMDGOALS)),)
+	strip_option := -s
+endif
 
-install: all man
-	$(MKDIR_P) $(bindir) $(mandir)
-	$(INSTALL) -s --strip-program $(STRIP) -m 755 \
-		$(prefixed_executables) $(bindir)
-	$(INSTALL) -m 644 $(man_pages) $(mandir)
-	$(MKDIR_P) $(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
+install install-strip: all man
+	$(MKDIR_P) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
+	$(INSTALL) $(strip_option) $(prefixed_executables) $(DESTDIR)$(bindir)
+	$(INSTALL_DATA) $(man_pages) $(DESTDIR)$(mandir)
+	$(MKDIR_P) $(DESTDIR)$(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
 
-$(tarball):
+$(tarball) dist tarball:
 	$(Q) rm -rf $(tarball) $(tarball_pfx)
 	$(Q) git archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar