Зміни у системі установки/видалення

Для створення каталогів додано змінну DIR_MODE (там де вона потрібна).
Прибрано зайве створення каталогів /usr/sbin і подібних.

diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
index deaf437e0e85b128ccb2005ec170a4c4a8da882b..20530c5288567758285cffa29c41b0dd2e4344ff 100644 (file)
--- a/projects/rlm_stg/Makefile
+++ b/projects/rlm_stg/Makefile
@@ -53,14 +53,13 @@ distclean: clean
 install: install-bin
 
 install-bin:
-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/lib
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 
 uninstall: uninstall-bin
 
 uninstall-bin:
-       rm -f $(PREFIX)/usr/sbin/$(PROG)
+       rm -f $(PREFIX)/usr/lib/$(PROG)
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)

diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
index 03e95fa713885e15530fa00a313f356a25697923..ff08de0dc08932104a26868b1a446725c6527d0a 100644 (file)
--- a/projects/rscriptd/Makefile
+++ b/projects/rscriptd/Makefile
@@ -56,13 +56,12 @@ distclean: clean
 install: install-bin install-data
 
 install-bin:
-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/sbin
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 
 install-data:
        # Install etc
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/etc/stargazer
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer
        install -m $(DATA_MODE) -o $(OWNER) ./rscriptd.conf $(PREFIX)/etc/stargazer/rscriptd.conf
 
 uninstall: uninstall-bin uninstall-data

diff --git a/projects/rscriptd/build b/projects/rscriptd/build
index 38302ee34dcdb5a883dde007727bb76b47ab04b6..53916ebf17109595e1a5397405805f8afc9c09ce 100755 (executable)
--- a/projects/rscriptd/build
+++ b/projects/rscriptd/build
@@ -13,6 +13,7 @@ CONFFILE="../../Makefile.conf"
 PREFIX="/"
 BIN_MODE=0755
 DATA_MODE=0644
+DIR_MODE=0755
 OWNER=root
 
 if [ -z $1 ]
@@ -138,6 +139,7 @@ echo "LDFLAGS=$LDFLAGS" >> $CONFFILE
 echo "PREFIX=$PREFIX" >> $CONFFILE
 echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
 echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
+echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
 echo "OWNER=$OWNER" >> $CONFFILE
 
 $MAKE $MAKEOPTS

diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
index 7f597b95936022be55d92f0ae8ea74688d0f0512..12c7b9fc69744df74109f7599f457b6c15d98fe0 100644 (file)
--- a/projects/sgauth/Makefile
+++ b/projects/sgauth/Makefile
@@ -56,13 +56,12 @@ distclean: clean
 install: install-bin install-data
 
 install-bin:
-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/sbin
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 
 install-data:
        # Install etc
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/etc
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc
        install -m $(DATA_MODE) -o $(OWNER) ./sgauth.conf $(PREFIX)/etc/sgauth.conf
 
 uninstall: uninstall-bin uninstall-data
@@ -72,7 +71,7 @@ uninstall-bin:
 
 uninstall-data:
        # Uninstall etc
-       rm -f $(PREFIX)/etc/stargazer/sgauth.conf
+       rm -f $(PREFIX)/etc/sgauth.conf
 
 
 ifneq ($(MAKECMDGOALS),distclean)

diff --git a/projects/sgauth/build b/projects/sgauth/build
index e61b957ce4157d1cc584d3701322593726720f30..eef6026f5db7b23e8a1f224d6230f90a46e6679d 100755 (executable)
--- a/projects/sgauth/build
+++ b/projects/sgauth/build
@@ -13,6 +13,7 @@ CONFFILE="../../Makefile.conf"
 PREFIX="/"
 BIN_MODE=0755
 DATA_MODE=0644
+DIR_MODE=0755
 OWNER=root
 
 if [ -z $1 ]

diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
index f9f0042b2745b063d4fe2d144e5b207fb9032137..6cc8962f99fc6e811db4fc2d960c0aecf2982fe3 100644 (file)
--- a/projects/sgconf/Makefile
+++ b/projects/sgconf/Makefile
@@ -63,22 +63,17 @@ clean:
 distclean: clean
        rm -f ../../Makefile.conf
 
-install: install-bin install-data
+install: install-bin
 
 install-bin:
-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/sbin
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 
-install-data:
-
 uninstall: uninstall-bin uninstall-data
 
 uninstall-bin:
        rm -f $(PREFIX)/usr/sbin/$(PROG)
 
-uninstall-data:
-
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)

diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
index 60288877bd731f729920e83d9707ccfd106c54ff..33989ae2c4a3225e70744438a39983593239f7ef 100644 (file)
--- a/projects/sgconf_xml/Makefile
+++ b/projects/sgconf_xml/Makefile
@@ -69,19 +69,11 @@ install-bin:
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
 
-install-data:
-       # Install etc
-       install -m $(DATA_MODE) -o $(OWNER) -D $(ETC_DIR)/sgconf.conf $(PREFIX)/etc/stargazer/sgconf.conf
-
 uninstall: uninstall-bin uninstall-data
 
 uninstall-bin:
        rm -f $(PREFIX)/usr/sbin/$(PROG)
 
-uninstall-data:
-       # Uninstall etc
-       rm -f $(PREFIX)/etc/stargazer/sgconf.conf
-
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)

diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile
index a0f2edca880a857f979c3c36c15717e8adfd857a..1e7e70d47c96ba18f27775e8941721a37f5a3720 100644 (file)
--- a/projects/stargazer/Makefile
+++ b/projects/stargazer/Makefile
@@ -73,16 +73,15 @@ distclean: clean
 install: install-bin install-data
 
 install-bin:
-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/sbin
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
        $(MAKE) -C $(DIR_LIBSRC) install
        $(MAKE) -C $(DIR_PLUGINS) install
 
 install-data:
        # Install etc
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/etc/stargazer
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/etc/stargazer/conf-available.d
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/etc/stargazer/conf-enabled.d
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-available.d
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/etc/stargazer/conf-enabled.d
        install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/stargazer.conf $(PREFIX)/etc/stargazer/stargazer.conf
        install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/conf-available.d/*.conf $(PREFIX)/etc/stargazer/conf-available.d
        ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_ao.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ao.conf
@@ -100,9 +99,9 @@ endif
        install -m $(BIN_MODE) -o $(OWNER) $(ETC_DIR)/On* $(PREFIX)/etc/stargazer/
        
        # Install file db
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/var/stargazer/admins
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/var/stargazer/tariffs
-       mkdir -m $(DATA_MODE) -p $(PREFIX)/var/stargazer/users/test
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/admins
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/tariffs
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/var/stargazer/users/test
        install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/admins/admin.adm $(PREFIX)/var/stargazer/admins/admin.adm
        install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/tariffs/tariff.tf $(PREFIX)/var/stargazer/tariffs/tariff.tf
        install -m $(DATA_MODE) -o $(OWNER) $(VAR_DIR)/users/test/conf $(PREFIX)/var/stargazer/users/test/conf

diff --git a/projects/stargazer/build b/projects/stargazer/build
index cda3b5e08de040f69804abaeebaf610664e33482..637dc739f1c039b6217e48b26809885a081415d0 100755 (executable)
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -17,6 +17,10 @@ BIN_MODE=0755
 
 DATA_MODE=0644
 
+# Dir access bits
+
+DIR_MODE=0755
+
 # Binaries and data files owner
 
 OWNER=root
@@ -394,6 +398,7 @@ echo "LIB_THREAD=$LIB_THREAD" >> $CONFFILE
 echo "PREFIX=$PREFIX" >> $CONFFILE
 echo "BIN_MODE=$BIN_MODE" >> $CONFFILE
 echo "DATA_MODE=$DATA_MODE" >> $CONFFILE
+echo "DIR_MODE=$DIR_MODE" >> $CONFFILE
 echo "OWNER=$OWNER" >> $CONFFILE
 echo "VAR_DIR=$VAR_DIR" >> $CONFFILE
 echo "ETC_DIR=$ETC_DIR" >> $CONFFILE

diff --git a/projects/stargazer/plugins/Makefile.in b/projects/stargazer/plugins/Makefile.in
index 7e01585e80b8839df0a0eb64327c7afcd9907c59..87e0c4ce34589419de268f2db5c5b1d0bb9cce6d 100644 (file)
--- a/projects/stargazer/plugins/Makefile.in
+++ b/projects/stargazer/plugins/Makefile.in
@@ -23,7 +23,7 @@ clean:
        rm -f deps $(PROG) *.o tags *.*~
 
 install:
-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/lib/stg
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
 
 uninstall:

diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
index c6db5f999c9b26f4ae5ba73a03de1cda599eee17..714a99ea2cbebf9ce16f86a0f9bf49319396e62c 100644 (file)
--- a/stglibs/Makefile.in
+++ b/stglibs/Makefile.in
@@ -67,7 +67,7 @@ clean:
        done
 
 install: $(PROG)
-       mkdir -m $(BIN_MODE) -p $(PREFIX)/usr/lib/stg
+       mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
        install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
 
 uninstall: