Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Feb 2014 04:57:05 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r346099 - in head/databases/sqlite2: . files
Message-ID:  <201402260457.s1Q4v5bx010769@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: miwi
Date: Wed Feb 26 04:57:04 2014
New Revision: 346099
URL: http://svnweb.freebsd.org/changeset/ports/346099
QAT: https://qat.redports.org/buildarchive/r346099/

Log:
  - Stage support

Modified:
  head/databases/sqlite2/Makefile
  head/databases/sqlite2/files/patch-Makefile.in

Modified: head/databases/sqlite2/Makefile
==============================================================================
--- head/databases/sqlite2/Makefile	Wed Feb 26 04:46:05 2014	(r346098)
+++ head/databases/sqlite2/Makefile	Wed Feb 26 04:57:04 2014	(r346099)
@@ -79,11 +79,9 @@ post-install:
 	@(cd ${WRKSRC} && ${GMAKE} install-tcl)
 	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
 .endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/example.tcl ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/databases/sqlite2/files/patch-Makefile.in
==============================================================================
--- head/databases/sqlite2/files/patch-Makefile.in	Wed Feb 26 04:46:05 2014	(r346098)
+++ head/databases/sqlite2/files/patch-Makefile.in	Wed Feb 26 04:57:04 2014	(r346099)
@@ -20,12 +20,12 @@
  install:	sqlite libsqlite.la sqlite.h
  	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
 -	$(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
-+	$(INSTALL) .libs/libsqlite.a $(exec_prefix)/lib
-+	$(INSTALL) .libs/libsqlite.so $(exec_prefix)/lib
-+	$(INSTALL) .libs/libsqlite.so.2 $(exec_prefix)/lib
++	$(INSTALL) .libs/libsqlite.a $(DESTDIR)$(exec_prefix)/lib
++	$(INSTALL) .libs/libsqlite.so $(DESTDIR)$(exec_prefix)/lib
++	$(INSTALL) .libs/libsqlite.so.2 $(DESTDIR)$(exec_prefix)/lib
  	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
 -	$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
-+	$(INSTALL) .libs/sqlite $(exec_prefix)/bin
++	$(INSTALL) .libs/sqlite $(DESTDIR)$(exec_prefix)/bin
  	$(INSTALL) -d $(DESTDIR)$(prefix)/include
  	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
 -	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
@@ -34,8 +34,8 @@
 +	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig
 +
 +install-tcl:	libtclsqlite.la
-+	$(INSTALL) -d $(prefix)/lib/sqlite
-+	$(INSTALL) .libs/libtclsqlite.so $(prefix)/lib/sqlite
++	$(INSTALL) -d $(DESTDIR)$(prefix)/lib/sqlite
++	$(INSTALL) .libs/libtclsqlite.so $(DESTDIR)$(prefix)/lib/sqlite
  
  clean:	
  	rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402260457.s1Q4v5bx010769>