GRMPF!!!; refs #115

12 years ago · 5db3802250
parent a00560cdc0
commit 5db3802250
2 changed files with 4 additions and 14 deletions
--- a/src/makefile.am
+++ b/src/makefile.am
@ -86,14 +86,9 @@ ${QMAKE_TARGET}: ${QMAKE_MAKEFILE} ${ALL_SRC} $(LANGS:%=@PACKAGENAME@_%.qm)

 install-data-local:
 	${mkinstalldirs} ${DESTDIR}${libdir}
-	for file in ${QMAKE_TARGET}*; do \
-	  if test -e $file; then \
-	    ${INSTALL} $file ${DESTDIR}${bindir}; \
-	  fi; \
-	done
-	for file in release/${QMAKE_TARGET}*; do \
-	  if test -e $file; then \
-	    ${INSTALL} $file ${DESTDIR}${bindir}; \
+	for file in ${QMAKE_TARGET}{,.app,.exe}; do \
+	  if test -e $$file; then \
+	    ${INSTALL} $$file ${DESTDIR}${bindir}; \
 	  fi; \
 	done

--- a/src/qbrowserlib/makefile.am
+++ b/src/qbrowserlib/makefile.am
@ -77,12 +77,7 @@ ${QMAKE_TARGET}: ${QMAKE_MAKEFILE} ${ALL_SRC} $(LANGS:%=qbrowserlib_%.qm)

 install-data-local:
 	${mkinstalldirs} ${DESTDIR}${libdir}
-	for file in ${QMAKE_TARGET}*; do \
-	  if test -e $file; then \
-	    ${INSTALL} $file ${DESTDIR}${libdir}; \
-	  fi; \
-	done
-	for file in release/${QMAKE_TARGET}*; do \
+	for file in ${QMAKE_TARGET}{.so*,*.dylib,*.dll}; do \
 	  if test -e $file; then \
 	    ${INSTALL} $file ${DESTDIR}${libdir}; \
 	  fi; \