clean up packaging scripts

jafl · Jan 6, 2016 · 55e2968 · 55e2968
1 parent e509a0e
commit 55e2968
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,6 @@ In this directory, you will find:
 ```
 README               This file
 INSTALL              Instructions for compiling and installing this package
-FAQ                  List of Frequently Asked Questions
 LICENSE              License information
 CHANGES              Describes changes from previous versions
 

diff --git a/include/make/jx_targets b/include/make/jx_targets
@@ -35,7 +35,8 @@ pre_build_pkgs:
 init_tarball:
 	@${RM} -r ${PKG_PATH}
 	@mkdir -p ${PKG_PATH}/lib ${PKG_PATH}/docs_HTML
-	@ln -s ../README               ${PKG_PATH}/README
+	@if [[ -e ../README]];    then ln -s ../README    ${PKG_PATH}/README;    fi
+	@if [[ -e ../README.md]]; then ln -s ../README.md ${PKG_PATH}/README.md; fi
 	@ln -s ../COPYING              ${PKG_PATH}/COPYING
 	@ln -s ../pkg/install          ${PKG_PATH}/install
 	@ln -s ../pkg/uninstall        ${PKG_PATH}/uninstall

diff --git a/obsolete/arrow/pkg/install b/obsolete/arrow/pkg/install
@@ -25,8 +25,8 @@ mkdir -p $LIB
 cp lib/* $LIB
 
 mkdir -p $DOC/HTML
-cp README FAQ COPYING menu_strings $DOC
-cp docs_HTML/*                     $DOC/HTML
+cp README COPYING menu_strings $DOC
+cp docs_HTML/*                 $DOC/HTML
 
 cp desktop/arrow.desktop $APP/
 cp desktop/arrow.xpm     $ICON/

diff --git a/obsolete/svn_client/pkg/install b/obsolete/svn_client/pkg/install
@@ -25,8 +25,8 @@ mkdir -p $LIB
 cp lib/* $LIB
 
 mkdir -p $DOC/HTML
-cp README FAQ COPYING menu_strings $DOC
-cp docs_HTML/*                     $DOC/HTML
+cp README COPYING menu_strings $DOC
+cp docs_HTML/*                 $DOC/HTML
 
 cp desktop/nps_svn_client.desktop $APP/
 cp desktop/nps_svn_client.xpm     $ICON/

diff --git a/programs/code_crusader/pkg/install b/programs/code_crusader/pkg/install
@@ -36,10 +36,10 @@ cp -R text_templates    $LIB
 cp -R scripts           $LIB
 
 mkdir -p $DOC/HTML
-cp README FAQ menu_strings $DOC
-cp -R macros               $DOC
-cp -R CPM_rules            $DOC
-cp docs_HTML/*             $DOC/HTML
+cp README.md menu_strings $DOC
+cp -R macros              $DOC
+cp -R CPM_rules           $DOC
+cp docs_HTML/*            $DOC/HTML
 
 cp desktop/code_crusader.desktop $APP/
 cp desktop/code_crusader.xpm     $ICON/

diff --git a/programs/code_medic/pkg/install b/programs/code_medic/pkg/install
@@ -27,8 +27,8 @@ mkdir -p $LIB
 cp lib/* $LIB
 
 mkdir -p $DOC/HTML
-cp README FAQ COPYING menu_strings $DOC
-cp docs_HTML/*                     $DOC/HTML
+cp README.md COPYING menu_strings $DOC
+cp docs_HTML/*                    $DOC/HTML
 
 cp desktop/code_medic.desktop $APP/
 cp desktop/code_medic.xpm     $ICON/

diff --git a/programs/code_mill/pkg/install b/programs/code_mill/pkg/install
@@ -25,8 +25,8 @@ mkdir -p $LIB
 cp lib/* $LIB
 
 mkdir -p $DOC/HTML
-cp README FAQ COPYING menu_strings $DOC
-cp docs_HTML/*                     $DOC/HTML
+cp README COPYING menu_strings $DOC
+cp docs_HTML/*                 $DOC/HTML
 
 cp desktop/code_mill.desktop $APP/
 cp desktop/code_mill.xpm     $ICON/

diff --git a/programs/drakon/pkg/install b/programs/drakon/pkg/install
@@ -25,8 +25,8 @@ mkdir -p $LIB
 cp lib/* $LIB
 
 mkdir -p $DOC/HTML
-cp README FAQ COPYING menu_strings $DOC
-cp docs_HTML/*                     $DOC/HTML
+cp README COPYING menu_strings $DOC
+cp docs_HTML/*                 $DOC/HTML
 
 cp desktop/drakon.desktop $APP/
 cp desktop/drakon.xpm     $ICON/

diff --git a/programs/glove/pkg/install b/programs/glove/pkg/install
@@ -25,8 +25,8 @@ mkdir -p $LIB
 cp lib/* $LIB
 
 mkdir -p $DOC/HTML
-cp README FAQ COPYING menu_strings $DOC
-cp docs_HTML/*                     $DOC/HTML
+cp README COPYING menu_strings $DOC
+cp docs_HTML/*                 $DOC/HTML
 
 cp desktop/glove.desktop $APP/
 cp desktop/glove.xpm     $ICON/

diff --git a/programs/jx_project_wizard/app_template/Make.header b/programs/jx_project_wizard/app_template/Make.header
@@ -127,7 +127,7 @@ source:
      ${TAR} -czf ${SRC_TAR_FILE} ${filter-out %.o %~ %L.cpp %Y.cpp, \
                                    ${shell cd ${J_DISTR_TAR_DIR}; echo \
               ${addprefix ${SRC_FILE_DIR}/, \
-                README COPYING FAQ Make.* *.jcc *.fd \
+                README COPYING Make.* *.jcc *.fd \
                 code/* strings/* pkg } }}
 
 #

diff --git a/programs/jx_project_wizard/app_template/pkg/install b/programs/jx_project_wizard/app_template/pkg/install
@@ -25,8 +25,8 @@ mkdir -p $LIB
 cp lib/* $LIB
 
 mkdir -p $DOC/HTML
-cp README FAQ COPYING menu_strings $DOC
-cp docs_HTML/*                     $DOC/HTML
+cp README COPYING menu_strings $DOC
+cp docs_HTML/*                 $DOC/HTML
 
 cp desktop/<Binary>.desktop $APP/
 cp desktop/<Binary>.xpm     $ICON/

diff --git a/programs/leibnitz/pkg/install b/programs/leibnitz/pkg/install
@@ -25,8 +25,8 @@ mkdir -p $LIB
 cp lib/* $LIB
 
 mkdir -p $DOC/HTML
-cp README FAQ COPYING menu_strings $DOC
-cp docs_HTML/*                     $DOC/HTML
+cp README.md COPYING menu_strings $DOC
+cp docs_HTML/*                    $DOC/HTML
 
 cp desktop/leibnitz.desktop $APP/
 cp desktop/leibnitz.xpm     $ICON/

diff --git a/programs/ssh_askpass/pkg/install b/programs/ssh_askpass/pkg/install
@@ -23,7 +23,7 @@ mkdir -p $LIB
 cp lib/* $LIB
 
 mkdir -p $DOC
-cp README FAQ COPYING $DOC
+cp README COPYING $DOC
 
 # post
 

diff --git a/programs/systemg/pkg/install b/programs/systemg/pkg/install
@@ -25,8 +25,8 @@ mkdir -p $LIB
 cp lib/* $LIB
 
 mkdir -p $DOC/HTML
-cp README FAQ COPYING menu_strings $DOC
-cp docs_HTML/*                     $DOC/HTML
+cp README COPYING menu_strings $DOC
+cp docs_HTML/*                 $DOC/HTML
 
 cp desktop/systemg.desktop        $APP/
 cp desktop/systemg_choose.desktop $APP/

diff --git a/tutorial/README b/tutorial/README
@@ -6,8 +6,7 @@ To run the programs, make sure that the jx and jcore libraries are on your
 LD_LIBRARY_PATH.  These libraries will either be installed in standard
 system directories or will be found in the "jlib/lib" directory of the JX
 distribution.  For instructions on setting environment variables (i.e.
-LD_LIBRARY_PATH), please refer to the JX FAQ on the web.
-(http://www.newplanetsoftware.com/jx/faq.html)
+LD_LIBRARY_PATH), please refer to the JX FAQ.
 
 When studying the source code, you will probably find it useful to refer to
 the documentation provided with the JX distribution for further information