- ChangeLog update by changelog.sh

[projects/setup.git] / Makefile

diff --git a/Makefile b/Makefile
index 971b022b70166df0f1c508e86dd4bb5da5759c98..e14d18bb9543ef84c35df21d2d4e9d64cf0ac437 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Very basic and very simple Makefile. Maybe it would be nice to make it
 # in ac/am.... but I'm too lazy ;)
 # 
-VERSION                = 2.4.3
+VERSION                = 2.4.6
 
 CC             = gcc
 OPT_FLAGS      = -O2 -g
@@ -9,15 +9,19 @@ CFLAGS                = $(OPT_FLAGS) -Wall
 INSTALL                = install
 SBINDIR                = /sbin
 ETCDIR         = /etc
-PROFILEDIR     = $(ETCDIR)/profil.d
+PROFILEDIR     = $(ETCDIR)/profile.d
+ENVDIR         = $(ETCDIR)/env.d
+SHRCDIR                = $(ETCDIR)/shrc.d
 #########################################
 
 BIN_FILES      = joinpasswd
 DOCS           = ChangeLog
 ETC_FILES      = filesystems fstab group host.conf hosts motd mtab \
            netgroup passwd profile protocols resolv.conf securetty \
-           services shells
+           services shells suid_profile
 PROFILE_FILES  = tmp-dir.csh tmp-dir.sh
+ENV_FILES      = EDITOR HISTFILESIZE HOME_ETC MAILCHECK MAILPATH \
+           NNTPSERVER ORGANIZATION TMOUT VISUAL
 
 SOURCES                = joinpasswd.c
 CLEAN          = $(BIN_FILES) *.o core *.tar.gz *.tar.bz2 *~ *.swp
@@ -39,19 +43,26 @@ install:
        $(INSTALL) -d $(DESTDIR)/$(SBINDIR)
        $(INSTALL) -d $(DESTDIR)/$(ETCDIR)
        $(INSTALL) -d $(DESTDIR)/$(PROFILEDIR)
+       $(INSTALL) -d  $(DESTDIR)/$(ENVDIR)
        $(INSTALL) $(BIN_FILES) $(DESTDIR)/$(SBINDIR)
        cd etc; $(INSTALL) $(ETC_FILES) $(DESTDIR)/$(ETCDIR)
        cd etc/profile.d; $(INSTALL) $(PROFILE_FILES) $(DESTDIR)/$(PROFILEDIR)
+       cd etc/env.d; $(INSTALL) $(ENV_FILES) $(DESTDIR)/$(ENVDIR)
 
 dist: clean
        
        $(INSTALL) -d setup-$(VERSION)/etc/profile.d
-       $(INSTALL) $(DOCS) $(SOURCES) setup-$(VERSION)
+       $(INSTALL) -d setup-$(VERSION)/etc/env.d
+       $(INSTALL) -d setup-$(VERSION)/etc/shrc.d
+       $(INSTALL) $(DOCS) $(SOURCES) Makefile setup-$(VERSION)
        for file in $(ETC_FILES); do \
                $(INSTALL) etc/$$file setup-$(VERSION)/etc; \
        done
        for file in $(PROFILE_FILES); do \
                $(INSTALL) etc/profile.d/$$file setup-$(VERSION)/etc/profile.d; \
        done
+       for file in $(ENV_FILES); do \
+               $(INSTALL) etc/env.d/$$file setup-$(VERSION)/etc/env.d; \
+       done
        tar -cvjf setup-$(VERSION).tar.bz2 setup-$(VERSION)
        rm -rf setup-$(VERSION)