Changeset 32257

Timestamp:

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

Author:

sjm84

Message:

Correcting the folder structure of xpdf-tools once extracted.

Location:

gs2-extensions/xpdf-tools/trunk/src

Files:

• CASCADE-MAKE.sh (modified) (1 diff)
• licence-files (moved) (moved from gs2-extensions/xpdf-tools/trunk/src/redistribute )

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

@@ -14 +14 @@
 done
 
-# makedist: makes a temporary subdirectory, also called xpdf-tools, puts just the stuff we want in there
-# and then runs the CASCADE-MAKE command to make a distribution (tar.gz) out of our whitelist temporary folder
-# then get rid of that temporary xpdf-tools folder.
+# makedist: just put the files and folder we want in the distribution tarball
+# Note that any directories specified for files in the whitelist will also go in
+# maintaining directory structure. So "linux/bin/pdf*" will end up in the final
+# extracted xpdf-tools folder, not just pdf*.
 if [ $makedist = "1" ] ; then
-    mkdir -p xpdf-tools
-    cp $GSDLOS/bin/pdf* xpdf-tools/.
-    # See xpdftools' README: licencing files and manpage need to be redistributed with xpdf-tools binaries
-    cp -r $GSDLOS/man xpdf-tools/.
-    cp redistribute/* xpdf-tools/.
-    toplevel_make_dist $GSDLOS xpdf-tools
-    rm -rf xpdf-tools
+    # 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/*
 fi