[uClibc-cvs] CVS uClibc++

CVS User gkajmowi gkajmowi at codepoet.org
Fri Jan 14 21:56:59 UTC 2005


Update of /var/cvs/uClibc++
In directory nail:/tmp/cvs-serv4210

Modified Files:
	Makefile Rules.mak 
Log Message:
Allows for configurable subdirectories for installation

--- /var/cvs/uClibc++/Makefile	2005/01/04 00:07:30	1.9
+++ /var/cvs/uClibc++/Makefile	2005/01/14 21:56:58	1.10
@@ -77,15 +77,15 @@
 headers: include/system_configuration.h
 
 install:
-	$(INSTALL) -d $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)/lib
+	$(INSTALL) -d $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)$(UCLIBCXX_RUNTIME_LIB_SUBDIR)
 	$(INSTALL) -m 644 src/lib*.so.$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL) \
-		$(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)/lib
-	cp -fa src/*.so $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)/lib
-	cp -fa src/*.so.$(MAJOR_VERSION) $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)/lib
-	cp -fa src/*.so.$(MAJOR_VERSION).$(MINOR_VERSION) $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)/lib
+		$(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)$(UCLIBCXX_RUNTIME_LIB_SUBDIR)
+	cp -fa src/*.so $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)$(UCLIBCXX_RUNTIME_LIB_SUBDIR)
+	cp -fa src/*.so.$(MAJOR_VERSION) $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)$(UCLIBCXX_RUNTIME_LIB_SUBDIR)
+	cp -fa src/*.so.$(MAJOR_VERSION).$(MINOR_VERSION) $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)$(UCLIBCXX_RUNTIME_LIB_SUBDIR)
 	$(MAKE) -C include install
-	$(INSTALL) -d $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)/bin
-	$(INSTALL) -m 755 bin/g++-uc $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)/bin
+	$(INSTALL) -d $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)$(UCLIBCXX_RUNTIME_BIN_SUBDIR)
+	$(INSTALL) -m 755 bin/g++-uc $(PREFIX)$(UCLIBCXX_RUNTIME_PREFIX)$(UCLIBCXX_RUNTIME_BIN_SUBDIR)
 
 
 .cpp.o:
--- /var/cvs/uClibc++/Rules.mak	2005/01/14 14:44:44	1.11
+++ /var/cvs/uClibc++/Rules.mak	2005/01/14 21:56:58	1.12
@@ -75,6 +75,9 @@
 TARGET_ARCH:=$(strip $(subst ",, $(strip $(TARGET_ARCH))))
 #RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(RUNTIME_PREFIX))))))
 UCLIBCXX_RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(UCLIBCXX_RUNTIME_PREFIX))))))
+UCLIBCXX_RUNTIME_LIB_SUBDIR:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(UCLIBCXX_RUNTIME_LIB_SUBDIR))))))
+UCLIBCXX_RUNTIME_BIN_SUBDIR:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(UCLIBCXX_RUNTIME_BIN_SUBDIR))))))
+UCLIBCXX_RUNTIME_INCLUDE_SUBDIR:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(UCLIBCXX_RUNTIME_INCLUDE_SUBDIR))))))
 export UCLIBCXX_RUNTIME_PREFIX
 
 ARFLAGS:=r



More information about the uClibc-cvs mailing list