Changeset 32259

Timestamp:

2018-07-11T18:29:37+12:00 (6 years ago)

Author:

sjm84

Message:

Once more, redoing the folder structure of the xpdftools tarball once extracted

Location:

gs2-extensions/xpdf-tools/trunk/src

Files:

• CASCADE-MAKE.sh (modified) (1 diff)
• COPYING (moved) (moved from gs2-extensions/xpdf-tools/trunk/src/licence-files/COPYING )
• COPYING3 (moved) (moved from gs2-extensions/xpdf-tools/trunk/src/licence-files/COPYING3 )
• GS-README.txt (modified) (1 diff)
• README (moved) (moved from gs2-extensions/xpdf-tools/trunk/src/licence-files/README )

gs2-extensions/xpdf-tools/trunk/src/CASCADE-MAKE.sh

@@ -19 +19 @@
 # extracted xpdf-tools folder, not just pdf*.
 if [ $makedist = "1" ] ; then
-    # See xpdftools' README: licencing files and xpdf-tools manpages
-    # need to be redistributed with xpdf-tools binaries
-    toplevel_make_dist $GSDLOS $GSDLOS/bin/pdf* $GSDLOS/man licence-files/*
+    # temporary folders to ensure folder structure of untarred distribution tarball is correct
+    mkdir -p bin
+    cp $GSDLOS/bin/pdf* bin/.
+    # As per xpdftools' README, licencing files (README, COPYING, COPYING3) and
+    # xpdf-tools' manpages need to be redistributed with xpdf-tools binaries
+    cp -r $GSDLOS/man .
+    toplevel_make_dist $GSDLOS bin man README COPYING*
+    # remove the temporary bin and man folders
+    rm -rf bin man
 fi

gs2-extensions/xpdf-tools/trunk/src/GS-README.txt

@@ -656 +656 @@
 The files and folders into the distribution tarball xpdf-tools-GSDLOS.tar.gz are:
 - the GSDLOS/bin/pdf* statically linked binaries (or dynamic executables linked against mostly static libraries in the case of Macs),
-- the GSDLOS/man folder as well as the "licence-files" folder containing further compulsory files as required by xpdf-tools' license.
+- the GSDLOS/man folder as well as the further compulsory files README, COPYING and COPYING3 as required for xpdf-tools' license.
 
 Beware that the cascade-make makedist function always maintains the directory structure of folders but also files included in the whitelist.
-So when untarred, the folder xpdf-tools is produced with subfolders like linux/bin (containing the pdf* binaries), a linux/man subfolder and a
-licence-files subfolder.
+So when untarred, the folder xpdf-tools is produced with subfolders like linux/bin (containing the pdf* binaries), a linux/man subfolder
+and files README, COPYING, COPYING3.