Ticket #28172: patch-src-Makefile.diff

Makefile

@@ -4 +4 @@
 VERSION = 20101114-ti
 
 # installation prefix (set this if you don't install by hand)
-ifndef PREFIX
-PREFIX = /usr/local/msp430
+ifndef prefix
+prefix = /usr/local/msp430
 endif
 
 # name of target architecture (used for conform naming)
 
 target = msp430
 
-prefix_target = $(PREFIX)/${target}
-bindir = $(PREFIX)/bin
+prefix_target = $(prefix)/${target}
+bindir = $(prefix)/bin
 includedir = ${prefix_target}/include
 libdir = ${prefix_target}/lib
 
@@ -91 +91 @@
 clean-crt:
         ${RM} -f $(CRT_OBJS)
 
-install-crt: $(CRT_OBJS) ${libdir}
+install-crt: $(CRT_OBJS) $(DESTDIR)${libdir}
         ${INSTALL}
 
 makedir-crt:
@@ -109 +109 @@
 install-multilib:
         for i in `$(CC) --print-multi-lib 2>/dev/null`; do \
           dir=`echo $$i | sed -e 's/;.*$$//'` ; \
-          mkdir -p $(libdir)/$$dir; \
+          mkdir -p $(DESTDIR)$(libdir)/$$dir; \
           $(MAKE) $(MFLAGS) MULTILIB_DIR="$$dir" install-libc install-libm ; \
         done;
 
@@ -128 +128 @@
 
 install-headers-legacy: ins-legacy-msp430
 
-ins-hr: $(wildcard $(SRC_ROOT)/../include/*.h) $(wildcard $(SRC_ROOT)/../include/$(HDR_VENDOR)/*.h) ${includedir}
+ins-hr: $(wildcard $(SRC_ROOT)/../include/*.h) $(wildcard $(SRC_ROOT)/../include/$(HDR_VENDOR)/*.h) $(DESTDIR)${includedir}
         ${INSTALL}
 
-ins-hs: $(wildcard $(SRC_ROOT)/../include/sys/*.h) ${includedir}/sys
+ins-hs: $(wildcard $(SRC_ROOT)/../include/sys/*.h) $(DESTDIR)${includedir}/sys
         ${INSTALL}
 
-ins-hb: $(wildcard $(SRC_ROOT)/../include/bits/*.h) ${includedir}/bits
+ins-hb: $(wildcard $(SRC_ROOT)/../include/bits/*.h) $(DESTDIR)${includedir}/bits
         ${INSTALL}
 
-ins-legacy-msp430: $(wildcard $(SRC_ROOT)/../include/legacy/msp430/*.h) ${includedir}/msp430
+ins-legacy-msp430: $(wildcard $(SRC_ROOT)/../include/legacy/msp430/*.h) $(DESTDIR)${includedir}/msp430
         ${INSTALL}
 
-fix-limits: $(wildcard $(SRC_ROOT)/../include/limits.h) ${includedir}/../../lib/gcc-lib/msp430/3.0/include
+fix-limits: $(wildcard $(SRC_ROOT)/../include/limits.h) $(DESTDIR)${includedir}/../../lib/gcc-lib/msp430/3.0/include
         ${INSTALL}      
 
 #--------------- directories ---------------
-$(includedir) $(includedir)/bits $(includedir)/sys $(includedir)/msp430:
+$(DESTDIR)$(includedir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/bits $(DESTDIR)$(includedir)/sys $(DESTDIR)$(includedir)/msp430:
         $(MD)
 #------------------------------------------------------------------------
 #------------------------------------------------------------------------
@@ -196 +196 @@
 clean-libc:
         ${RM} -f $(LIBC) $(LIBC_OBJS)
 
-install-libc: $(LIBC) $(libdir)/$(MULTILIB_DIR)
+install-libc: $(LIBC) $(DESTDIR)$(libdir)/$(MULTILIB_DIR)
         ${INSTALL}
 #------------------------------------------------------------------------
 #-------------- Math & FP libs ---------------
@@ -229 +229 @@
 $(LIBFP): $(LIBFP_OBJS)
         ${AR} rc $@ $?
 
-install-libm: $(LIBM) $(LIBFP) $(libdir)/$(MULTILIB_DIR)
+install-libm: $(LIBM) $(LIBFP) $(DESTDIR)$(libdir)/$(MULTILIB_DIR)
         ${INSTALL}
 
 clean-libm: