changeset 4181:3fc30cd416ac

maint: merge extra head
author John D
date Tue, 02 Aug 2016 15:21:03 -0400
parents 4b0004dc5941 (diff) 6409a12147fd (current diff)
children be6b10b6faf5
files dist-files.mk src/mingw-transfig-1-fixes.patch src/transfig-1-configure.patch
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Tue Jul 26 05:59:06 2016 -0400
+++ b/Makefile.in	Tue Aug 02 15:21:03 2016 -0400
@@ -877,7 +877,7 @@
 dist:
 	rm -rf $(distdir)
 	mkdir $(distdir)
-	$(TAR) cf - $(DIST_FILES) | ( cd $(distdir) ; $(TAR) xpf - )
+	( cd $(TOP_DIR) ; $(TAR) cf - $(DIST_FILES) ) | ( cd $(distdir) ; $(TAR) xpf - )
 	$(TAR) czf $(distdir).tar.gz $(distdir)
 
 include $(TOP_DIR)/binary-dist-rules.mk
--- a/dist-files.mk	Tue Jul 26 05:59:06 2016 -0400
+++ b/dist-files.mk	Tue Aug 02 15:21:03 2016 -0400
@@ -29,6 +29,7 @@
   build-gcc-1-mingw-float.patch \
   build-gcc-2-intrinsics.patch \
   build-gcc.mk \
+  build-gettext.mk \
   build-gperf.mk \
   build-libtool.mk \
   build-m4.mk \
@@ -60,7 +61,6 @@
   dcmtk-1-fixes.patch \
   dcmtk-2-ming64.patch \
   dcmtk.mk \
-  default-octave-1-fixes.patch \
   default-octave.mk \
   devil-1-png.patch \
   devil.mk \
@@ -272,6 +272,7 @@
   libpaper.mk \
   libpng-test.c \
   libpng.mk \
+  librsb.mk \
   librsvg-1-fixes.patch \
   librsvg-test.c \
   librsvg.mk \
@@ -310,7 +311,6 @@
   mdbtools.mk \
   mingw-cairo-1-ssize-t-defined.patch \
   mingw-cfitsio-1-fixes.patch \
-  mingw-default-octave-1-msys-fixes.patch \
   mingw-epstool-1-fixes.patch \
   mingw-fontconfig-ln_s.patch \
   mingw-glib-1-fixes.patch \
@@ -493,6 +493,7 @@
   of-signal.mk \
   of-sockets-1-cross-fixes.patch \
   of-sockets.mk \
+  of-sparsersb.mk \
   of-specfun.mk \
   of-splines.mk \
   of-statistics.mk \
@@ -500,7 +501,6 @@
   of-strings-1-fixes.patch \
   of-strings.mk \
   of-struct.mk \
-  of-tisean-1-fortran.patch \
   of-tisean.mk \
   of-tsa-1-cross-fixes.patch \
   of-tsa.mk \
@@ -838,6 +838,7 @@
   create-screenshot-for-doc \
   install-sh \
   make-shared-from-static \
+  makeinst-script.sh.in \
   patch-tool-mxe \
   pkg-install.py \
   s3-fetch-and-sync \
@@ -854,7 +855,6 @@
   dist-files.mk \
   index.html \
   Makefile.in \
-  makeinst-script.sh \
   octave-wrapper.in \
   octaverc