X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=00175bea7aa94036a0b720a7038f8eec600d9af2;hp=0870f2edd2a81fc7afa1d7451c278a920e57f6a8;hb=486314426fcd25e5271fd65a982f8b321585e195;hpb=87f0cdf5e33cd50af029c6f79ca8fab943490209

diff --git a/Makefile.real b/Makefile.real
index 0870f2ed..00175bea 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -1,5 +1,5 @@
-VARDIR := /var/paraslash
-MANDIR := $(datarootdir)/man/man1
+vardir := /var/paraslash
+mandir := $(datarootdir)/man/man1
 STRIP := $(CROSS_COMPILE)strip
 HOSTCC ?= cc
 MKDIR_P := mkdir -p
@@ -81,10 +81,10 @@ $(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,\
 $(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,\
 $(subst z,Z,$1))))))))))))))))))))))))))
 
-CPPFLAGS += -DBINDIR='"$(BINDIR)"'
-CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
-CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
-CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
+CPPFLAGS += -DBINDIR='"$(bindir)"'
+CPPFLAGS += -DBUILD_DATE='"$(shell date)"'
+CPPFLAGS += -DUNAME_RS='"$(shell uname -rs)"'
+CPPFLAGS += -DCC_VERSION='"$(shell $(CC) --version | head -n 1)"'
 CPPFLAGS += -DMAIN_INPUT_FILE_IS_$(*F)
 CPPFLAGS += $(arch_cppflags)
 CPPFLAGS += -I/usr/local/include
@@ -110,6 +110,7 @@ LDFLAGS += $(clock_gettime_ldflags)
 
 ifeq ($(uname_s),Linux)
 	# these cause warnings on *BSD
+	CPPFLAGS += -Wunused-macros
 	STRICT_CFLAGS += -fdata-sections -ffunction-sections
 	STRICT_CFLAGS += -Wstrict-prototypes
 	STRICT_CFLAGS += -Wshadow
@@ -131,7 +132,7 @@ $(cmdlist_dir)/%.command_list.h: %.cmd %.c | $(cmdlist_dir)
 $(cmdlist_dir)/%.command_list.man: %.cmd %.c | $(cmdlist_dir)
 	@[ -z "$(Q)" ] || echo 'GEN $@'
 	$(Q) ./command_util.bash man < $< > $@
-$(cmdlist_dir)/%.completion.h: %.cmd %.c | $(cmdlist_dir)
+$(cmdlist_dir)/%.completion.h: %.cmd | $(cmdlist_dir)
 	@[ -z "$(Q)" ] || echo 'GEN $@'
 	$(Q) ./command_util.bash compl $(strip $(call TOUPPER,$(*F)))_COMPLETERS \
 		$(strip $(call TOUPPER,$(*F)))_COMMANDS	< $< > $@
@@ -352,14 +353,13 @@ distclean: clean2 test-clean
 maintainer-clean: distclean
 	@[ -z "$(Q)" ] || echo 'MAINTAINER-CLEAN'
 	$(Q) rm -f *.tar.bz2 config.h configure config.h.in
-	$(Q) rm -rf web_sync
 
 install: all man
-	$(MKDIR_P) $(BINDIR) $(MANDIR)
+	$(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
+		$(prefixed_executables) $(bindir)
+	$(INSTALL) -m 644 $(man_pages) $(mandir)
+	$(MKDIR_P) $(vardir) >/dev/null 2>&1 || true # not fatal, so don't complain
 
 $(tarball):
 	$(Q) rm -rf $(tarball) $(tarball_pfx)