X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fclam%2Frules.def;h=abd5983dac3af0a7799995ee1edf8309f20c9d08;hb=ef5c4c4e80db9a02cb23c756bd2ab8787b98d5f5;hp=7258fc22950fdbaeee057a30f104e01a506a585f;hpb=960e4d8f948ecb537970cba0bed57f1142f1f0b6;p=feisty_meow.git

diff --git a/scripts/clam/rules.def b/scripts/clam/rules.def
index 7258fc22..abd5983d 100644
--- a/scripts/clam/rules.def
+++ b/scripts/clam/rules.def
@@ -24,13 +24,13 @@ endif
 	$(HIDER)echo
 	$(HIDER)echo [$@] is missing files or has a makefile problem.
 	$(HIDER)echo
-	$(HIDESH)$(CLAM_DIR)/exit_make.sh
+	$(HIDESH)$(CLAM_SCRIPTS)/exit_make.sh
 
 # This rule halts make for some supposedly devastating reason.  More
 # information should be printed out by the cause of the halt.
 %.halt:
 	@echo CLAM execution halted, the cause being: $@
-	$(HIDESH)$(CLAM_DIR)/exit_make.sh
+	$(HIDESH)$(CLAM_SCRIPTS)/exit_make.sh
 
 # Provides a time-stamp in the make log.
 show_date.%:
@@ -66,7 +66,7 @@ if [ ! -d "$(CLAM_TMP)" ]; then \
   mkdir "$(CLAM_TMP)"; \
 fi'
 ifeq "$(QUIET)" ""
-	$(HIDER)echo Project $(PROJECT) [$(shell basename $(shell dirname $(shell pwd) ) )/$(shell basename $(shell pwd) )] v. $(major).$(minor).$(revision).$(build)
+	$(HIDER)echo Project $(PROJECT) [$(shell echo $(CURRENT_DIR) | sed -e 's/.*\/\([^\/]*\)\/\([^\/]*\)/\1\/\2/')] v. $(major).$(minor).$(revision).$(build)
 endif
 	$(HIDER)rm -f $(FLAG_FILES)
 
@@ -88,11 +88,11 @@ endif
 
 # runs the programs specified in the RUN_TARGETS variable.
 run_targets:
-	$(HIDESH)"$(CLAM_DIR)/target_runner.sh"
+	$(HIDESH)"$(CLAM_SCRIPTS)/target_runner.sh"
 
 # "make_subdirs" travels down each subdirectory and builds using make.
 make_subdirs:
-	$(HIDESH)$(CLAM_DIR)/make_subdirs.sh
+	$(HIDESH)$(CLAM_SCRIPTS)/make_subdirs.sh
 
 # "clean" is a default target that removes object files, libs, executable
 # files and such that were created by the project.  it invokes the makefile
@@ -132,7 +132,7 @@ fi'
 
 # "clean_subdirs" travels down each subdirectory and cleans using make.
 clean_subdirs:
-	$(HIDESH)$(CLAM_DIR)/clean_subdirs.sh
+	$(HIDESH)$(CLAM_SCRIPTS)/clean_subdirs.sh
 
 # "rm_links" removes the files in the current directory that are links
 # to other files.  this is only useful in a unix environment.