merge fixes to work with tcl/pkgs system

tcltk · Jul 17, 2012 · ad46b76 · ad46b76
2 parents 328cea7 + 7656e3f
commit ad46b76
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/tdbc/Makefile.in b/tdbc/Makefile.in
@@ -193,6 +193,7 @@ all: binaries libraries doc
 #========================================================================
 
 binaries: $(BINARIES)
+	cp -p $(srcdir)/library/tdbc.tcl $(top_builddir)
 
 libraries:
 
@@ -386,6 +387,7 @@ clean:
 	-test -z "$(BINARIES)" || rm -f $(BINARIES)
 	-rm -f *.$(OBJEXT) core *.core
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-rm -f tdbc.tcl
 
 distclean: clean
 	-rm -f *.tab.c

diff --git a/tdbcpostgres/Makefile.in b/tdbcpostgres/Makefile.in
@@ -225,11 +225,12 @@ install-libraries: libraries
 install-doc: doc
 	@$(INSTALL_DATA_DIR) $(DESTDIR)$(mandir)/mann
 	@echo "Installing documentation in $(DESTDIR)$(mandir)"
-	@list='$(srcdir)/doc/*.n'; for i in $$list; do \
-	    echo "Installing $$i"; \
-	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
-	done
+#   Not written yet!
+#	@list='$(srcdir)/doc/*.n'; for i in $$list; do \
+#	    echo "Installing $$i"; \
+#	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
+#	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
+#	done
 
 test: binaries libraries
 	$(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) \
@@ -318,13 +319,15 @@ dist: dist-clean
 #	cp -p $(srcdir)/doc/tdbc_postgres.n $(DIST_DIR)/doc/
 
 	mkdir $(DIST_DIR)/generic
-	cp -p $(srcdir)/generic/tdbcpostgres.c $(DIST_DIR)/generic/
+	cp -p $(srcdir)/generic/fakepq.h $(srcdir)/generic/pqStubDefs.txt \
+		$(srcdir)/generic/pqStubInit.c $(srcdir)/generic/pqStubs.h \
+		$(srcdir)/generic/tdbcpostgres.c $(DIST_DIR)/generic/
 
 	mkdir $(DIST_DIR)/library
 	cp -p $(srcdir)/library/tdbcpostgres.tcl $(DIST_DIR)/library/
 
 	mkdir $(DIST_DIR)/tests
-	cp -p $(srcdir)/tests/all.tcl $(srcdir)/tests/postgres.test \
+	cp -p $(srcdir)/tests/all.tcl $(srcdir)/tests/tdbcpostgres.test \
 		$(DIST_DIR)/tests/
 
 	(cd $(DIST_ROOT); $(COMPRESS);)

diff --git a/tdbcsqlite3/Makefile.in b/tdbcsqlite3/Makefile.in
@@ -68,7 +68,7 @@ mandir		= @mandir@
 
 DESTDIR		=
 
-PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
+PKG_DIR		= $(PACKAGE_NAME)-$(PACKAGE_VERSION)
 pkgdatadir	= $(datadir)/$(PKG_DIR)
 pkglibdir	= $(libdir)/$(PKG_DIR)
 pkgincludedir	= $(includedir)/$(PKG_DIR)