Merge branch 'iss-72' into develop

HerbertKoelman · Nov 10, 2016 · e7f6930 · e7f6930
2 parents 02247ff + c8d0245
commit e7f6930
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -54,9 +54,8 @@ doxygen:
 
 install:
 	$(MKDIR) $(INCLUDEDIR)
-	cd include/pthread && $(INSTALL) *.hpp *.h $(INCLUDEDIR)
-	$(INSTALL) lib/lib@PACKAGE_NAME@-@BUILD@.a @libdir@
-	cd ${LIBDIR} && $(LN_S) -f lib@PACKAGE_NAME@-@BUILD@.a lib@PACKAGE_NAME@.a
+	$(INSTALL) include/pthread/*.hpp include/pthread/*.h $(INCLUDEDIR)
+	$(INSTALL) lib/lib@PACKAGE_NAME@.a @libdir@
 
 uninstall:
 	$(RM) -R  $(INCLUDEDIR)

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -35,14 +35,13 @@ LIBS=@LIBS@
 
 OBJECTS=@OBJECTS@
 
-TARGETS=lib@PACKAGE_NAME@-@BUILD@.a
+LIBPTHREAD=lib@PACKAGE_NAME@.a
 
-all:${TARGETS}
+all:${LIBPTHREAD}
 
-lib@PACKAGE_NAME@-@BUILD@.a: $(OBJECTS)
+lib@PACKAGE_NAME@.a: $(OBJECTS)
 	${AR} ${LIBDIR}/$@ $(OBJECTS)
 	$(RANLIB) ${LIBDIR}/$@
-	cd ${LIBDIR} && $(LN_S) -f lib@PACKAGE_NAME@-@BUILD@.a lib@PACKAGE_NAME@.a
 
 globber: clean
 	-$(RM) -R Makefile autom4te.cache config.log config.status