Исправлен процесс инсталляции для поддержки нового подхода к конфигам

diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile
index 7241c569dba3346f797fd64788494cf1536c8db6..a0f2edca880a857f979c3c36c15717e8adfd857a 100644 (file)
--- a/projects/stargazer/Makefile
+++ b/projects/stargazer/Makefile
@@ -81,7 +81,21 @@ install-bin:
 install-data:
        # Install etc
        mkdir -m $(DATA_MODE) -p $(PREFIX)/etc/stargazer
 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

        install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/stargazer.conf $(PREFIX)/etc/stargazer/stargazer.conf
        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
+       ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_ia.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ia.conf
+       ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_ping.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_ping.conf
+       ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_sg.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_sg.conf
+
+ifeq ($(OS),linux)
+       ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_cap_ether.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_ether.conf
+else
+       ln -s $(PREFIX)/etc/stargazer/conf-available.d/mod_cap_bpf.conf $(PREFIX)/etc/stargazer/conf-enabled.d/mod_cap_bpf.conf
+endif
+

        install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/rules $(PREFIX)/etc/stargazer/rules
        install -m $(BIN_MODE) -o $(OWNER) $(ETC_DIR)/On* $(PREFIX)/etc/stargazer/
        
        install -m $(DATA_MODE) -o $(OWNER) $(ETC_DIR)/rules $(PREFIX)/etc/stargazer/rules
        install -m $(BIN_MODE) -o $(OWNER) $(ETC_DIR)/On* $(PREFIX)/etc/stargazer/
        


@@ -136,5 +150,3 @@ deps:       $(SRCS) ../../Makefile.conf
          echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
          echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
        done
          echo "`$(CC) $(CXXFLAGS) $(SEARCH_DIRS) -MM $$file` Makefile ../../Makefile.conf" >> deps ;\
          echo -e '\t$$(CC) -c $$< $(CXXFLAGS) $(SEARCH_DIRS) $(DEFS)' >> deps ;\
        done

-
-

diff --git a/projects/stargazer/build b/projects/stargazer/build
index 4771a8f4837e01faf1640088b3a866824eb23ae6..cda3b5e08de040f69804abaeebaf610664e33482 100755 (executable)
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -7,7 +7,7 @@
 
 # Installation path prefix
 
 
 # Installation path prefix
 

-PREFIX=""
+#PREFIX=""

 
 # Binaries access bits
 
 
 # Binaries access bits