use LABEL for default sample mounts

[projects/setup.git] / Makefile

diff --git a/Makefile b/Makefile
index 1b5931a24401b8eafe28146ec6f7c7c436f69446..d1d2f77eaffe06ef109008b1139641f43ec139eb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 # Very basic and very simple Makefile. Maybe it would be nice to make it
 # in ac/am.... but I'm too lazy ;)
 #
-VERSION                = 2.8.1
+VERSION                = 2.9.0
 
 CC             = gcc
-OPT_FLAGS      = -O2 -g
-CFLAGS         = $(OPT_FLAGS) -Wall
+OPT_FLAGS      = -Wformat -Werror=format-security -fvar-tracking-assignments -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector -O2 -g2 -Wall
+CFLAGS         = $(OPT_FLAGS) -Wall -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
 INSTALL                = install
 SBINDIR                = /sbin
 ETCDIR         = /etc
@@ -22,6 +22,7 @@ ETC_FILES     = filesystems fstab group host.conf hosts motd \
 PROFILE_FILES  = tmp-dir.csh tmp-dir.sh
 ENV_FILES      = EDITOR HISTFILESIZE HOME_ETC MAILCHECK MAILPATH \
            NNTPSERVER ORGANIZATION TMOUT VISUAL
+SHRC_FILES     = 256term.csh 256term.sh
 
 SOURCES                = joinpasswd.c update-fstab.c postshell.c delpasswd.c
 CLEAN          = $(BIN_FILES) *.o core *.tar.gz *.tar.bz2 *~ *.swp
@@ -46,12 +47,14 @@ install:
        $(INSTALL) -d $(DESTDIR)/$(SBINDIR)
        $(INSTALL) -d $(DESTDIR)/$(ETCDIR)
        $(INSTALL) -d $(DESTDIR)/$(PROFILEDIR)
-       $(INSTALL) -d  $(DESTDIR)/$(ENVDIR)
+       $(INSTALL) -d $(DESTDIR)/$(ENVDIR)
+       $(INSTALL) -d $(DESTDIR)/$(SHRCDIR)
        $(INSTALL) $(BIN_FILES) $(DESTDIR)/$(SBINDIR)
        cd etc; $(INSTALL) $(ETC_FILES) $(DESTDIR)/$(ETCDIR)
        ln -sf /proc/self/mounts $(DESTDIR)/$(ETCDIR)/mtab
        cd etc/profile.d; $(INSTALL) $(PROFILE_FILES) $(DESTDIR)/$(PROFILEDIR)
        cd etc/env.d; $(INSTALL) $(ENV_FILES) $(DESTDIR)/$(ENVDIR)
+       cd etc/shrc.d; $(INSTALL) $(SHRC_FILES) $(DESTDIR)/$(SHRCDIR)
 
 dist: changelog clean
        $(INSTALL) -d setup-$(VERSION)/etc/profile.d
@@ -67,6 +70,9 @@ dist: changelog clean
        for file in $(ENV_FILES); do \
                $(INSTALL) -m644 etc/env.d/$$file setup-$(VERSION)/etc/env.d; \
        done
+       for file in $(SHRC_FILES); do \
+               $(INSTALL) -m644 etc/shrc.d/$$file setup-$(VERSION)/etc/shrc.d; \
+       done
        tar -cvjf setup-$(VERSION).tar.bz2 setup-$(VERSION)
        rm -rf setup-$(VERSION)