Browse code

Makefile: use one tab for install-cfg and added nop not to confuse some versions of shell

- apparently they evaluate wrongly the sequence: escape (\), new line,
tab, done

Daniel-Constantin Mierla authored on 14/08/2014 09:09:36
Showing 1 changed files
... ...
@@ -755,7 +755,7 @@ $(man_prefix)/$(man_dir)/man5:
755 755
 
756 756
 # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) 
757 757
 install-cfg: $(cfg_prefix)/$(cfg_dir)
758
-		@if [ -f etc/$(CFG_NAME).cfg ]; then \
758
+	@if [ -f etc/$(CFG_NAME).cfg ]; then \
759 759
 			sed $(foreach m,$(modules_dirs),\
760 760
 					-e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)\([:/\"]\)#$($(m)_target)\1#g") \
761 761
 					-e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \
... ...
@@ -768,7 +768,7 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
768 768
 					$(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg; \
769 769
 			fi; \
770 770
 		fi
771
-		@if [ -f etc/$(CFG_NAME)-basic.cfg ]; then \
771
+	@if [ -f etc/$(CFG_NAME)-basic.cfg ]; then \
772 772
 			sed $(foreach m,$(modules_dirs),\
773 773
 					-e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)\([:/\"]\)#$($(m)_target)\1#g") \
774 774
 					-e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \
... ...
@@ -781,7 +781,7 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
781 781
 					$(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg; \
782 782
 			fi; \
783 783
 		fi
784
-		@if [ -f etc/$(CFG_NAME)-oob.cfg ]; then \
784
+	@if [ -f etc/$(CFG_NAME)-oob.cfg ]; then \
785 785
 			sed $(foreach m,$(modules_dirs),\
786 786
 					-e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)\([:/\"]\)#$($(m)_target)\1#g") \
787 787
 					-e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \
... ...
@@ -795,8 +795,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
795 795
 					$(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg; \
796 796
 			fi; \
797 797
 		fi
798
-		@# other configs
799
-		@for r in $(C_INSTALL_CFGS) ""; do \
798
+	@# other configs
799
+	@for r in $(C_INSTALL_CFGS) ""; do \
800 800
 			if [ -n "$$r" ]; then \
801 801
 				if [ -f "$$r" ]; then \
802 802
 					n=`basename "$$r"` ; \
... ...
@@ -818,14 +818,15 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
818 818
 					fi ; \
819 819
 				fi ; \
820 820
 			fi ; \
821
-		done; true
822
-		# radius dictionary
823
-		$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME)
824
-		$(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)
821
+			: ; done; true
822
+	@# radius dictionary
823
+	@$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME)
824
+	@$(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)
825
+	@echo "config files installed"
825 826
 
826 827
 install-bin: $(bin_prefix)/$(bin_dir) $(NAME)
827
-		$(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME)
828
-		$(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir)
828
+	$(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME)
829
+	$(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir)
829 830
 
830 831
 
831 832
 install-share: $(share_prefix)/$(share_dir)