# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1581611607 18000
# Node ID 8f5e625062f31b3052854bc1b06fb3fececdf314
# Parent  e8b5bca84d88d3758ef02a17f159516c7820eb9a
use %reldir% in more places in module.mk files in scripts directory

* scripts/+containers/module.mk, scripts/+matlab/+lang/module.mk,
scripts/audio/module.mk, scripts/deprecated/module.mk,
scripts/elfun/module.mk, scripts/general/module.mk,
scripts/geometry/module.mk, scripts/gui/module.mk,
scripts/help/module.mk, scripts/image/module.mk, scripts/io/module.mk,
scripts/java/module.mk, scripts/legacy/module.mk,
scripts/linear-algebra/module.mk, scripts/miscellaneous/module.mk,
scripts/ode/module.mk, scripts/optimization/module.mk,
scripts/path/module.mk, scripts/pkg/module.mk,
scripts/plot/appearance/module.mk, scripts/plot/draw/module.mk,
scripts/plot/util/module.mk, scripts/polynomial/module.mk,
scripts/prefs/module.mk, scripts/profiler/module.mk,
scripts/set/module.mk, scripts/signal/module.mk,
scripts/sparse/module.mk, scripts/specfun/module.mk,
scripts/special-matrix/module.mk, scripts/startup/module.mk,
scripts/statistics/module.mk, scripts/strings/module.mk,
scripts/testfun/module.mk, scripts/time/module.mk,
scripts/web/module.mk:
Use %reldir% instead of literal directory name where possbile.
Ensure that all private directories are included in FCN_FILE_DIRS
list.

diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/+containers/module.mk
--- a/scripts/+containers/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/+containers/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/+containers
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/Map.m
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/+matlab/+lang/module.mk
--- a/scripts/+matlab/+lang/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/+matlab/+lang/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/+matlab/+lang
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/makeUniqueStrings.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/audio/module.mk
--- a/scripts/audio/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/audio/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/audio \
+  %reldir% \
   %reldir%/@audioplayer \
   %reldir%/@audiorecorder
 
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/deprecated/module.mk
--- a/scripts/deprecated/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/deprecated/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/deprecated
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/output_max_field_width.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/elfun/module.mk
--- a/scripts/elfun/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/elfun/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/elfun
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/acosd.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/general/module.mk
--- a/scripts/general/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/general/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/general \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/geometry/module.mk
--- a/scripts/geometry/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/geometry/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/geometry
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/convhull.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/gui/module.mk
--- a/scripts/gui/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/gui/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/gui \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/help/module.mk
--- a/scripts/help/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/help/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/help \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/image/module.mk
--- a/scripts/image/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/image/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/image \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/io/module.mk
--- a/scripts/io/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/io/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/io
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/beep.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/java/module.mk
--- a/scripts/java/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/java/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/java
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/javaArray.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/legacy/module.mk
--- a/scripts/legacy/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/legacy/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/legacy
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/findstr.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/linear-algebra/module.mk
--- a/scripts/linear-algebra/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/linear-algebra/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/linear-algebra
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/bandwidth.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/miscellaneous/module.mk
--- a/scripts/miscellaneous/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/miscellaneous/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/miscellaneous \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/ode/module.mk
--- a/scripts/ode/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/ode/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/ode \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/optimization/module.mk
--- a/scripts/optimization/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/optimization/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/optimization \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/path/module.mk
--- a/scripts/path/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/path/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/path \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/pkg/module.mk
--- a/scripts/pkg/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/pkg/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/pkg \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/plot/appearance/module.mk
--- a/scripts/plot/appearance/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/plot/appearance/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/plot/appearance \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/plot/draw/module.mk
--- a/scripts/plot/draw/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/plot/draw/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/plot/draw \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/plot/util/module.mk
--- a/scripts/plot/util/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/plot/util/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/plot/util \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_GEN_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/polynomial/module.mk
--- a/scripts/polynomial/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/polynomial/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/polynomial \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/prefs/module.mk
--- a/scripts/prefs/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/prefs/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/prefs \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/profiler/module.mk
--- a/scripts/profiler/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/profiler/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,4 @@
-FCN_FILE_DIRS += \
-  scripts/profiler
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/profexplore.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/set/module.mk
--- a/scripts/set/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/set/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,8 +1,9 @@
 FCN_FILE_DIRS += \
-  scripts/set \
+  %reldir% \
   %reldir%/private
 
-%canon_reldir%_PRIVATE_FCN_FILES = %reldir%/private/validsetargs.m
+%canon_reldir%_PRIVATE_FCN_FILES = \
+  %reldir%/private/validsetargs.m
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/intersect.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/signal/module.mk
--- a/scripts/signal/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/signal/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/signal \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/sparse/module.mk
--- a/scripts/sparse/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/sparse/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/sparse \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/specfun/module.mk
--- a/scripts/specfun/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/specfun/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/specfun
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/beta.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/special-matrix/module.mk
--- a/scripts/special-matrix/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/special-matrix/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/special-matrix
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/gallery.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/startup/module.mk
--- a/scripts/startup/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/startup/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/startup
+FCN_FILE_DIRS += %reldir%
 
 SITE_STARTUP_FILE_SRC  = %reldir%/site-rcfile
 
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/statistics/module.mk
--- a/scripts/statistics/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/statistics/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/statistics
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/bounds.m \
@@ -50,9 +50,7 @@
 
 %canon_reldir%_DATA = $(%canon_reldir%_FCN_FILES)
 
-FCN_FILES += \
-  $(%canon_reldir%_FCN_FILES) \
-  $(%canon_reldir%_PRIVATE_FCN_FILES)
+FCN_FILES += $(%canon_reldir%_FCN_FILES)
 
 PKG_ADD_FILES += %reldir%/PKG_ADD
 
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/strings/module.mk
--- a/scripts/strings/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/strings/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/strings
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/base2dec.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/testfun/module.mk
--- a/scripts/testfun/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/testfun/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/testfun
+FCN_FILE_DIRS += \
+  %reldir% \
+  %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
   %reldir%/private/compare_plot_demos.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/time/module.mk
--- a/scripts/time/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/time/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/time
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/addtodate.m \
diff -r e8b5bca84d88 -r 8f5e625062f3 scripts/web/module.mk
--- a/scripts/web/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/web/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/web
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/web.m \
@@ -14,4 +14,4 @@
 
 PKG_ADD_FILES += %reldir%/PKG_ADD
 
-DIRSTAMP_FILES += %reldir%/$(octave_dirstamp)
\ No newline at end of file
+DIRSTAMP_FILES += %reldir%/$(octave_dirstamp)