diff options
Diffstat (limited to 'c/src/lib/libbsp/i386/pc386')
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/start/Makefile.am | 18 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/Makefile.am | 12 |
3 files changed, 20 insertions, 15 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index ade024ba5c..28113f3eae 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,8 @@ +2003-12-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * start/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. + * startup/Makefile.am: s,${PROJECT_RELEASE}/lib,$(PROJECT_LIB),g. + 2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * console/Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.am b/c/src/lib/libbsp/i386/pc386/start/Makefile.am index a807395249..92961b6b8d 100644 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.am @@ -34,16 +34,16 @@ all-local: $(TMPINSTALL_FILES) EXTRA_DIST = start.S start16.S -${PROJECT_RELEASE}/lib/$(dirstamp): - @$(mkdir_p) ${PROJECT_RELEASE}/lib - @: > ${PROJECT_RELEASE}/lib/$(dirstamp) +$(PROJECT_LIB)/$(dirstamp): + @$(mkdir_p) $(PROJECT_LIB) + @: > $(PROJECT_LIB)/$(dirstamp) -${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) ${PROJECT_RELEASE}/lib/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) -TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/start$(LIB_VARIANT).$(OBJEXT) +$(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT): $(ARCH)/start$(LIB_VARIANT).$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) +TMPINSTALL_FILES += $(PROJECT_LIB)/start$(LIB_VARIANT).$(OBJEXT) -${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin: ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin ${PROJECT_RELEASE}/lib/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin -TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin +$(PROJECT_LIB)/start16$(LIB_VARIANT).bin: ${PROJECT_RELEASE}/lib/start16$(LIB_VARIANT).bin $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/start16$(LIB_VARIANT).bin +TMPINSTALL_FILES += $(PROJECT_LIB)/start16$(LIB_VARIANT).bin include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am index b6481a884c..ec2038454a 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am @@ -33,12 +33,12 @@ all-local: $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES) EXTRA_DIST = bspstart.c exit.c ldsegs.S linkcmds sbrk.c -${PROJECT_RELEASE}/lib/$(dirstamp): - @$(mkdir_p) ${PROJECT_RELEASE}/lib - @: > ${PROJECT_RELEASE}/lib/$(dirstamp) +$(PROJECT_LIB)/$(dirstamp): + @$(mkdir_p) $(PROJECT_LIB) + @: > $(PROJECT_LIB)/$(dirstamp) -${PROJECT_RELEASE}/lib/linkcmds: linkcmds ${PROJECT_RELEASE}/lib/$(dirstamp) - $(INSTALL_DATA) $< ${PROJECT_RELEASE}/lib/linkcmds -TMPINSTALL_FILES += ${PROJECT_RELEASE}/lib/linkcmds +$(PROJECT_LIB)/linkcmds: linkcmds $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds +TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds include $(top_srcdir)/../../../../automake/local.am |