user_list.c: Simplify populate_user_list().

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 827d04f9f7415a698bb9e520dc7c06e6a416084d..338d1039681b7e07cb820507c9bf9de4c692dd0d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,17 +1,18 @@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
+prefix := @prefix@
+exec_prefix := @exec_prefix@
 
-BINDIR = @bindir@
-VARDIR = /var/paraslash
-PKGDATADIR = @datarootdir@/@PACKAGE_NAME@
-MANDIR = @datarootdir@/man/man1
+BINDIR := @bindir@
+VARDIR := /var/paraslash
+PKGDATADIR := @datarootdir@/@PACKAGE_NAME@
+MANDIR := @datarootdir@/man/man1
 
-install_sh = @install_sh@
+install_sh := @install_sh@
 
-build_date = $(shell date)
-system = $(shell uname -rs)
-cc_version = $(shell $(CC) --version | head -n 1)
-codename = solar saturation
+build_date := $(shell date)
+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 := liquid interaction
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -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
@@ -67,12 +68,12 @@ tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
 tarball := @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2
 
 .PHONY: clean distclean maintainer-clean install man tarball
-all: $(BINARIES)
+all: $(BINARIES) $(man_pages)
 man: $(man_pages)
 tarball: $(tarball)
 
-fade_objs = fade.cmdline.o fade.o exec.o close_on_fork.o string.o fd.o
-fsck_objs = osl.o rbtree.o fsck.o string.o sha1.o fsck.cmdline.o
+fade_objs := fade.cmdline.o fade.o exec.o close_on_fork.o string.o fd.o
+fsck_objs := osl.o rbtree.o fsck.o string.o sha1.o fsck.cmdline.o
 
 *.o: para.h config.h gcc-compat.h
 
@@ -215,6 +216,7 @@ para_write: @write_objs@
 
 clean:
        rm -f *.o $(BINARIES)
+       rm -rf man
 distclean: clean
        rm -f Makefile autoscan.log config.status config.log && \
        rm -rf web/sync/* autom4te.cache aclocal.m4
@@ -233,14 +235,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