From bd7dc66b41c1232a8b11cbcefad8af05eb908d71 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 13 Dec 2003 05:23:42 +0000 Subject: 2003-12-13 Ralf Corsepius * Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. --- c/src/libchip/ChangeLog | 4 ++++ c/src/libchip/Makefile.am | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'c/src/libchip') diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index eda09d9064..ca33bf2b26 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,7 @@ +2003-12-13 Ralf Corsepius + + * Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am index 174f2d8717..ca84c0db19 100644 --- a/c/src/libchip/Makefile.am +++ b/c/src/libchip/Makefile.am @@ -131,9 +131,9 @@ CLEANDIRS = */$(ARCH) PREINSTALL_FILES = -${PROJECT_RELEASE}/lib/$(dirstamp): - @$(mkdir_p) ${PROJECT_RELEASE}/lib - @: > ${PROJECT_RELEASE}/lib/$(dirstamp) +$(PROJECT_LIB)/$(dirstamp): + @$(mkdir_p) $(PROJECT_LIB) + @: > $(PROJECT_LIB)/$(dirstamp) if LIBCHIP $(PROJECT_INCLUDE)/libchip/$(dirstamp): @@ -189,9 +189,9 @@ $(PROJECT_INCLUDE)/libchip/open_eth.h: network/open_eth.h $(PROJECT_INCLUDE)/lib $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/open_eth.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/open_eth.h -${PROJECT_RELEASE}/lib/libnetchip$(LIB_VARIANT).a: network/$(ARCH)/libnetchip$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/libnetchip$(LIB_VARIANT).a -TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/libnetchip$(LIB_VARIANT).a +$(PROJECT_LIB)/libnetchip$(LIB_VARIANT).a: network/$(ARCH)/libnetchip$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/libnetchip$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_LIB)/libnetchip$(LIB_VARIANT).a endif endif -- cgit v1.2.3