Browse code

Makefile: print run dir details in uninstall target

- exporte the runbasedir to config.mak

Daniel-Constantin Mierla authored on 12/02/2015 12:40:00
Showing 2 changed files
... ...
@@ -795,7 +795,7 @@ install-every-module-doc: $(foreach mods,$(modules_dirs),install-$(mods)-doc)
795 795
 
796 796
 install-every-module-man: $(foreach mods,$(modules_dirs),install-$(mods)-man)
797 797
 
798
-install-utils: utils $(bin_prefix)/$(bin_dir)
798
+install-utils: utils $(bin_prefix)/$(bin_dir) $(run_prefix)/$(run_dir)
799 799
 	@for r in $(C_INSTALL_BIN) "" ; do \
800 800
 		if [ -n "$$r" ]; then \
801 801
 			if [ -f "$$r" ]; then \
... ...
@@ -1027,6 +1027,7 @@ uninstall:
1027 1027
 	@echo " *LIBDIR Path is: ${lib_prefix}/${lib_dir}"
1028 1028
 	@echo " *MANDIR Path is: ${man_prefix}/${man_dir}"
1029 1029
 	@echo " *SHRDIR Path is: ${share_prefix}/${share_dir}"
1030
+	@echo " *RUNDIR Path is: $(run_prefix)/$(run_dir)"
1030 1031
 	@if [ "${PREFIX}" != "/usr/local" ] ; then \
1031 1032
 		echo "-Custom PREFIX Path" ; \
1032 1033
 		if [ "${PREFIX}" = "/" -o "${PREFIX}" = "/usr" ] ; then \
... ...
@@ -1057,6 +1058,7 @@ uninstall:
1057 1058
 		echo "rm -rf ${doc_prefix}/${doc_dir}" ; \
1058 1059
 		echo "rm -rf ${lib_prefix}/${lib_dir}" ; \
1059 1060
 		echo "rm -rf ${share_prefix}/${share_dir}" ; \
1061
+		echo "rm -rf $(run_prefix)/$(run_dir)" ; \
1060 1062
 		echo ; \
1061 1063
 		echo "-WARNING: before running the commands, be sure they don't delete any system directory or file" ; \
1062 1064
 	fi ;
... ...
@@ -467,7 +467,7 @@ cfg_target = $(prefix)/$(cfg_dir)
467 467
 bin_target = $(prefix)/$(bin_dir)
468 468
 #modules_target = $(prefix)/$(modules_dir)
469 469
 lib_target = $(prefix)/$(lib_dir)
470
-run_target = $(runbasedir)/$(run_dir)
470
+run_target = $(run_prefix)/$(run_dir)
471 471
 doc_target = $(prefix)/$(doc_dir)
472 472
 data_target = $(prefix)/$(data_dir)
473 473
 
... ...
@@ -2018,8 +2018,8 @@ saved_fixed_vars:=	MAIN_NAME  CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \
2018 2018
 # extra: prefix DESTDIR BASEDIR basedirt
2019 2019
 saved_chg_vars:=\
2020 2020
 		CC_EXTRA_OPTS CPU CFLAGS_RM CFLAGS MOD_CFLAGS LIB_CFLAGS UTILS_CFLAGS \
2021
-		BASEDIR basedir DESTDIR LIBDIR \
2022
-		PREFIX prefix\
2021
+		BASEDIR basedir DESTDIR LIBDIR RUNBASEDIR runbasedir \
2022
+		PREFIX prefix \
2023 2023
 		cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \
2024 2024
 		doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \
2025 2025
 		share_prefix share_dir lib_prefix lib_dir data_prefix data_dir \