diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-13 05:23:42 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-13 05:23:42 +0000 |
| commit | bd7dc66b41c1232a8b11cbcefad8af05eb908d71 (patch) | |
| tree | abd9702f111490e099958a1178fdccbed2717c7b /c/src/librtems++ | |
| parent | 2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-bd7dc66b41c1232a8b11cbcefad8af05eb908d71.tar.bz2 | |
2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g.
Diffstat (limited to 'c/src/librtems++')
| -rw-r--r-- | c/src/librtems++/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/librtems++/Makefile.am | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog index 691625e3ac..1dc9fcb945 100644 --- a/c/src/librtems++/ChangeLog +++ b/c/src/librtems++/ChangeLog @@ -1,3 +1,7 @@ +2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. + 2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/librtems++/Makefile.am b/c/src/librtems++/Makefile.am index 7af1e2ad9a..b68b6b3221 100644 --- a/c/src/librtems++/Makefile.am +++ b/c/src/librtems++/Makefile.am @@ -34,9 +34,9 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) 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 HAS_CXX $(PROJECT_INCLUDE)/rtems++/$(dirstamp): @@ -75,9 +75,9 @@ $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h: include/rtems++/rtemsTimer.h $(PROJECT_ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems++/rtemsTimer.h -${PROJECT_RELEASE}/lib/librtems++$(LIB_VARIANT).a: $(ARCH)/librtems++$(LIB_VARIANT).a ${PROJECT_RELEASE}/lib/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/librtems++$(LIB_VARIANT).a -TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/librtems++$(LIB_VARIANT).a +$(PROJECT_LIB)/librtems++$(LIB_VARIANT).a: $(ARCH)/librtems++$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a +TMPINSTALL_FILES += $(PROJECT_LIB)/librtems++$(LIB_VARIANT).a endif include $(top_srcdir)/../automake/local.am |