diff --git a/ChangeLog b/ChangeLog
index dba38ec8..61846a2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Oct 30 12:38:42 2002  Nicola Pero  <n.pero@mi.flashnet.it>
+
+	* target.make (AFTER_INSTALL_STATIC_LIB_COMMAND): Renamed
+	to AFTER_INSTALL_STATIC_LIB_CMD for consistency with other
+	variables.
+	(AFTER_INSTALL_SHARED_LIB_COMMAND): Idem.
+	* common.make (AFTER_INSTALL_LIBRARY_CMD): Updated for changes.
+	
 Mon Oct 28 10:48:26 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	* Instance/framework.make (Resources/Info.plist): Use
diff --git a/common.make b/common.make
index 520fefc0..4ede64ca 100644
--- a/common.make
+++ b/common.make
@@ -391,12 +391,12 @@ ifeq ($(shared), yes)
   OBJ_DIR_PREFIX            += shared_
   INTERNAL_OBJCFLAGS        += $(SHARED_CFLAGS)
   INTERNAL_CFLAGS           += $(SHARED_CFLAGS)
-  AFTER_INSTALL_LIBRARY_CMD =  $(AFTER_INSTALL_SHARED_LIB_COMMAND)
+  AFTER_INSTALL_LIBRARY_CMD =  $(AFTER_INSTALL_SHARED_LIB_CMD)
 else
   LIB_LINK_CMD              =  $(STATIC_LIB_LINK_CMD)
   FRAMEWORK_LINK_CMD        =  $(STATIC_FRAMEWORK_LINK_CMD)
   OBJ_DIR_PREFIX            += static_
-  AFTER_INSTALL_LIBRARY_CMD =  $(AFTER_INSTALL_STATIC_LIB_COMMAND)
+  AFTER_INSTALL_LIBRARY_CMD =  $(AFTER_INSTALL_STATIC_LIB_CMD)
   LIBRARY_NAME_SUFFIX       := s$(LIBRARY_NAME_SUFFIX)
 endif
 
diff --git a/target.make b/target.make
index 70d0d0b7..c3aa8301 100644
--- a/target.make
+++ b/target.make
@@ -107,13 +107,13 @@ HAVE_SHARED_LIBS = no
 STATIC_LIB_LINK_CMD = \
 	$(AR) $(ARFLAGS) $(AROUT)$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^;\
 	$(RANLIB) $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE)
-AFTER_INSTALL_STATIC_LIB_COMMAND = \
+AFTER_INSTALL_STATIC_LIB_CMD = \
 	(cd $(FINAL_LIBRARY_INSTALL_DIR); \
 	$(RANLIB) $(VERSION_LIBRARY_FILE))
 SHARED_LIB_LINK_CMD =
 SHARED_CFLAGS =
 SHARED_LIBEXT =
-AFTER_INSTALL_SHARED_LIB_COMMAND = \
+AFTER_INSTALL_SHARED_LIB_CMD = \
 	(cd $(FINAL_LIBRARY_INSTALL_DIR); \
 	 rm -f $(LIBRARY_FILE); \
 	 $(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
@@ -193,7 +193,7 @@ STATIC_LIB_LINK_CMD	= \
 # This doesn't work with 4.1, what about others?
 #ADDITIONAL_LDFLAGS += -Wl,-read_only_relocs,suppress
 
-AFTER_INSTALL_STATIC_LIB_COMMAND =
+AFTER_INSTALL_STATIC_LIB_CMD =
 
 SHARED_CFLAGS   += -dynamic
 SHARED_LIBEXT   = .dylib
@@ -292,7 +292,7 @@ STATIC_LIB_LINK_CMD	= \
 # This doesn't work with 4.1, what about others?
 #ADDITIONAL_LDFLAGS += -Wl,-read_only_relocs,suppress
 
-AFTER_INSTALL_STATIC_LIB_COMMAND =
+AFTER_INSTALL_STATIC_LIB_CMD =
 
 SHARED_CFLAGS   += -dynamic -fno-common
 SHARED_LIBEXT   = .dylib
@@ -407,7 +407,7 @@ STATIC_LIB_LINK_CMD	= \
 	/usr/bin/libtool $(STATIC_LD_PREFLAGS) -static $(ARCH_FLAGS) -o $@ $^ \
 	$(STATIC_LD_POSTFLAGS)
 
-AFTER_INSTALL_STATIC_LIB_COMMAND = \
+AFTER_INSTALL_STATIC_LIB_CMD = \
 	(cd $(FINAL_LIBRARY_INSTALL_DIR); \
 	$(RANLIB) $(VERSION_LIBRARY_FILE))
 
@@ -476,7 +476,7 @@ STATIC_LIB_LINK_CMD	= \
 # This doesn't work with 4.1, what about others?
 #ADDITIONAL_LDFLAGS += -Wl,-read_only_relocs,suppress
 
-AFTER_INSTALL_STATIC_LIB_COMMAND =
+AFTER_INSTALL_STATIC_LIB_CMD =
 
 SHARED_CFLAGS   += -dynamic
 SHARED_LIBEXT   = .a
@@ -540,7 +540,7 @@ STATIC_LIB_LINK_CMD	= \
 
 ADDITIONAL_LDFLAGS += -Wl,-read_only_relocs,suppress
 
-AFTER_INSTALL_STATIC_LIB_COMMAND =
+AFTER_INSTALL_STATIC_LIB_CMD =
 
 SHARED_CFLAGS   += -dynamic
 SHARED_LIBEXT   = .a
@@ -577,7 +577,7 @@ SHARED_FRAMEWORK_LINK_CMD = \
 	(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
 	  rm -f $(FRAMEWORK_LIBRARY_FILE); \
 	  $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
-AFTER_INSTALL_SHARED_LIB_COMMAND = \
+AFTER_INSTALL_SHARED_LIB_CMD = \
 	(cd $(FINAL_LIBRARY_INSTALL_DIR); \
           rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
           $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
@@ -667,7 +667,7 @@ SHARED_FRAMEWORK_LINK_CMD = \
 	  rm -f $(FRAMEWORK_LIBRARY_FILE) $(SONAME_FRAMEWORK_FILE); \
 	  $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(SONAME_FRAMEWORK_FILE); \
 	  $(LN_S) $(SONAME_FRAMEWORK_FILE) $(FRAMEWORK_LIBRARY_FILE))
-AFTER_INSTALL_SHARED_LIB_COMMAND = \
+AFTER_INSTALL_SHARED_LIB_CMD = \
 	(cd $(FINAL_LIBRARY_INSTALL_DIR); \
 	  rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
 	  $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
@@ -964,7 +964,7 @@ SHARED_FRAMEWORK_LINK_CMD = \
 	(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
 	  rm -f $(FRAMEWORK_LIBRARY_FILE); \
 	  $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
-AFTER_INSTALL_SHARED_LIB_COMMAND = \
+AFTER_INSTALL_SHARED_LIB_CMD = \
 	(cd $(FINAL_LIBRARY_INSTALL_DIR); \
           rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
           $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \