From: Maxim Mamontov Date: Thu, 30 Dec 2010 15:21:14 +0000 (+0200) Subject: Исправлен процесс инсталляции для поддержки нового подхода к конфигам X-Git-Tag: 2.407-rc3~217 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/fcef953f92c2e87cda8ed0a6f98991093fbe5769?hp=500cb6d34896d7adcf3bb3af36bf4cca0e0f10cd Исправлен процесс инсталляции для поддержки нового подхода к конфигам --- diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile index 7241c569..a0f2edca 100644 --- 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 + 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)/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/ @@ -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 - - diff --git a/projects/stargazer/build b/projects/stargazer/build index 4771a8f4..cda3b5e0 100755 --- a/projects/stargazer/build +++ b/projects/stargazer/build @@ -7,7 +7,7 @@ # Installation path prefix -PREFIX="" +#PREFIX="" # Binaries access bits