X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=435ab294e6b56bdf6f185ec4691f03230152e1f4;hp=9382ce757a51311a9c7356667a2db2ce229a735e;hb=6087405d00ebd7f3a6d8f383ab99b786a99029c2;hpb=55071ec8801a9c886f5fad11649b6390da1a751c

diff --git a/Makefile.in b/Makefile.in
index 9382ce75..435ab294 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,8 @@ MANDIR := @datarootdir@/man/man1
 install_sh := @install_sh@
 
 build_date := $(shell date)
-system := $(shell uname -rs)
+uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
+uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
 codename := solar saturation
 
@@ -26,7 +27,7 @@ DEBUG_CPPFLAGS += -Wredundant-decls
 # many warnings about trivial stuff
 # CPPFLAGS += -Wconversion
 
-ifeq ($(uname_S),Linux)
+ifeq ($(uname_s),Linux)
 	CPPFLAGS += -fdata-sections -ffunction-sections
 	LDFLAGS += -Wl,--gc-sections
 	CPPFLAGS += -Wstrict-prototypes
@@ -39,7 +40,7 @@ CPPFLAGS += -Wchar-subscripts
 CPPFLAGS += -Wformat-security
 CPPFLAGS += -DBINDIR='"$(BINDIR)"'
 CPPFLAGS += -DBUILD_DATE='"$(build_date)"'
-CPPFLAGS += -DSYSTEM='"$(system)"'
+CPPFLAGS += -DUNAME_RS='"$(uname_rs)"'
 CPPFLAGS += -DCODENAME='"$(codename)"'
 CPPFLAGS += -DCC_VERSION='"$(cc_version)"'
 CPPFLAGS += -Werror-implicit-function-declaration
@@ -233,14 +234,12 @@ install: all man
 	$(install_sh) -m 644 $(man_pages) $(MANDIR)
 	mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain
 
-@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) $(man_pages)
+@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add)
 	rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
 	git-archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
 		| tar --delete $(tarball_delete) > $(tarball_pfx).tar
 	mkdir $(tarball_pfx)
 	cp -r $(tarball_add) $(tarball_pfx)
-	mkdir -p $(tarball_pfx)/man/man1
-	cp -r $(man_pages) $(tarball_pfx)/man/man1
 	tar rf $(tarball_pfx).tar $(tarball_pfx)/*
 	rm -rf $(tarball_pfx)
 	bzip2 -9 $(tarball_pfx).tar