[llvm-commits] CVS: llvm/Makefile.rules

[Chris Lattner]

Changes in directory llvm:

Makefile.rules updated: 1.294 -> 1.295
---
Log message:

Fix installation of configured headers when objdir != srcdir.  Patch
contributed by Vladimir Merzliakov!


---
Diffs of the changes:  (+11 -3)

 Makefile.rules |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.294 llvm/Makefile.rules:1.295
--- llvm/Makefile.rules:1.294	Fri Feb  4 15:28:50 2005
+++ llvm/Makefile.rules	Tue Feb  8 20:24:00 2005
@@ -1450,18 +1450,26 @@
 	$(Verb) if [ -d "$(PROJ_SRC_ROOT)/include" ] ; then \
 	  cd $(PROJ_SRC_ROOT)/include && \
 	    find . -path '*/Internal' -prune -o '(' -type f \
-	      '!' '(' -name '*~' -o -name '.cvsignore' -o -name '.#*' ')' \
+	      '!' '(' -name '*~' -o -name '.cvsignore' -o -name '.#*' -o -name '*.in' ')' \
 	      -print ')' | grep -v CVS | pax -rwdvpe $(PROJ_includedir) ; \
 	fi
+	$(Verb) if [ -d "$(PROJ_OBJ_ROOT)/include" ] ; then \
+	  cd $(PROJ_OBJ_ROOT)/include && ( cd $(PROJ_SRC_ROOT)/include && \
+	    find . -path '*/Internal' -prune -o '(' -type f -name '*.in' -print ')' ) \
+	    | sed 's#.in$$##' | pax -rwdvpe $(PROJ_includedir) ; \
+	fi
 
 uninstall-local::
 	$(Echo) Uninstalling include files
 	$(Verb) if [ -d "$(PROJ_SRC_ROOT)/include" ] ; then \
 	  cd $(PROJ_SRC_ROOT)/include && \
 	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f \
-	      '!' '(' -name '*~' -o -name '.cvsignore' -o -name '.#*' ')' \
+	      '!' '(' -name '*~' -o -name '.cvsignore' -o -name '.#*' -o -name '*.in' ')' \
 	      -print ')' | grep -v CVS | sed 's#^#$(PROJ_includedir)/#'` ; \
-	fi 
+	  cd $(PROJ_SRC_ROOT)/include && \
+	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f -name '*.in' -print ')' \
+	    | sed 's#\.in$$##;s#^#$(PROJ_includedir)/#'` ; \
+	fi
 
 endif