# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1436885751 14400
# Node ID 916cc788d90604253c34658285601c0ec0c14353
# Parent  0e2da885a410c209233ab6473df19e78623c184d
fix installation of script files

* scripts/module.mk (nobase_fcnfile_DATA): Delete.

* scripts/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/linear-algebra/module.mk, scripts/miscellaneous/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/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/base/module.mk,
scripts/statistics/distributions/module.mk,
scripts/statistics/models/module.mk,
scripts/statistics/tests/module.mk, scripts/strings/module.mk,
scripts/testfun/module.mk, scripts/time/module.mk: Define individual
Xdir and X_DATA variables for each scripts subdirectory.

diff -r 0e2da885a410 -r 916cc788d906 scripts/audio/module.mk
--- a/scripts/audio/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/audio/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,7 @@
-FCN_FILE_DIRS += scripts/audio
+FCN_FILE_DIRS += \
+  scripts/audio \
+  scripts/audio/@audioplayer \
+  scripts/audio/@audiorecorder
 
 scripts_audio_FCN_FILES = \
   scripts/audio/lin2mu.m \
@@ -7,7 +10,9 @@
   scripts/audio/sound.m \
   scripts/audio/soundsc.m \
   scripts/audio/wavread.m \
-  scripts/audio/wavwrite.m \
+  scripts/audio/wavwrite.m
+
+scripts_audio_@audioplayer_FCN_FILES = \
   scripts/audio/@audioplayer/__get_properties__.m \
   scripts/audio/@audioplayer/audioplayer.m \
   scripts/audio/@audioplayer/display.m \
@@ -20,7 +25,9 @@
   scripts/audio/@audioplayer/set.m \
   scripts/audio/@audioplayer/stop.m \
   scripts/audio/@audioplayer/subsasgn.m \
-  scripts/audio/@audioplayer/subsref.m \
+  scripts/audio/@audioplayer/subsref.m
+
+scripts_audio_@audiorecorder_FCN_FILES = \
   scripts/audio/@audiorecorder/__get_properties__.m \
   scripts/audio/@audiorecorder/audiorecorder.m \
   scripts/audio/@audiorecorder/display.m \
@@ -38,7 +45,22 @@
   scripts/audio/@audiorecorder/subsasgn.m \
   scripts/audio/@audiorecorder/subsref.m
 
-FCN_FILES += $(scripts_audio_FCN_FILES)
+scripts_audiodir = $(fcnfiledir)/audio
+
+scripts_audio_DATA = $(scripts_audio_FCN_FILES)
+
+scripts_audio_@audioplayerdir = $(fcnfiledir)/audio/@audioplayer
+
+scripts_audio_@audioplayer_DATA = $(scripts_audio_@audioplayer_FCN_FILES)
+
+scripts_audio_@audiorecorderdir = $(fcnfiledir)/audio/@audiorecorder
+
+scripts_audio_@audiorecorder_DATA = $(scripts_audio_@audiorecorder_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_audio_FCN_FILES) \
+  $(scripts_audio_@audioplayer_FCN_FILES) \
+  $(scripts_audio_@audiorecorder_FCN_FILES)
 
 PKG_ADD_FILES += scripts/audio/PKG_ADD
 
diff -r 0e2da885a410 -r 916cc788d906 scripts/deprecated/module.mk
--- a/scripts/deprecated/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/deprecated/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -21,6 +21,10 @@
   scripts/deprecated/syl.m \
   scripts/deprecated/usage.m
 
+scripts_deprecateddir = $(fcnfiledir)/deprecated
+
+scripts_deprecated_DATA = $(scripts_deprecated_FCN_FILES)
+
 FCN_FILES += $(scripts_deprecated_FCN_FILES)
 
 PKG_ADD_FILES += scripts/deprecated/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/elfun/module.mk
--- a/scripts/elfun/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/elfun/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -27,6 +27,10 @@
   scripts/elfun/sind.m \
   scripts/elfun/tand.m
 
+scripts_elfundir = $(fcnfiledir)/elfun
+
+scripts_elfun_DATA = $(scripts_elfun_FCN_FILES)
+
 FCN_FILES += $(scripts_elfun_FCN_FILES)
 
 PKG_ADD_FILES += scripts/elfun/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/general/module.mk
--- a/scripts/general/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/general/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/general
+FCN_FILE_DIRS += \
+  scripts/general \
+  scripts/general/private
 
 scripts_general_PRIVATE_FCN_FILES = \
   scripts/general/private/__isequal__.m \
@@ -77,11 +79,20 @@
   scripts/general/subsindex.m \
   scripts/general/trapz.m \
   scripts/general/triplequad.m \
-  scripts/general/validateattributes.m \
+  scripts/general/validateattributes.m
+
+scripts_generaldir = $(fcnfiledir)/general
+
+scripts_general_DATA = $(scripts_general_FCN_FILES)
+
+scripts_general_privatedir = $(fcnfiledir)/general/private
+
+scripts_general_private_DATA = $(scripts_general_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_general_FCN_FILES) \
   $(scripts_general_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_general_FCN_FILES)
-
 PKG_ADD_FILES += scripts/general/PKG_ADD
 
 DIRSTAMP_FILES += scripts/general/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/geometry/module.mk
--- a/scripts/geometry/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/geometry/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -15,6 +15,10 @@
   scripts/geometry/voronoi.m \
   scripts/geometry/voronoin.m
 
+scripts_geometrydir = $(fcnfiledir)/geometry
+
+scripts_geometry_DATA = $(scripts_geometry_FCN_FILES)
+
 FCN_FILES += $(scripts_geometry_FCN_FILES)
 
 PKG_ADD_FILES += scripts/geometry/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/gui/module.mk
--- a/scripts/gui/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/gui/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/gui
+FCN_FILE_DIRS += \
+  scripts/gui \
+  scripts/gui/private
 
 scripts_gui_PRIVATE_FCN_FILES = \
   scripts/gui/private/__file_filter__.m \
@@ -34,11 +36,20 @@
   scripts/gui/uiwait.m \
   scripts/gui/waitbar.m \
   scripts/gui/waitforbuttonpress.m \
-  scripts/gui/warndlg.m \
+  scripts/gui/warndlg.m
+
+scripts_guidir = $(fcnfiledir)/gui
+
+scripts_gui_DATA = $(scripts_gui_FCN_FILES)
+
+scripts_gui_privatedir = $(fcnfiledir)/gui/private
+
+scripts_gui_private_DATA = $(scripts_gui_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_gui_FCN_FILES) \
   $(scripts_gui_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_gui_FCN_FILES)
-
 PKG_ADD_FILES += scripts/gui/PKG_ADD
 
 DIRSTAMP_FILES += scripts/gui/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/help/module.mk
--- a/scripts/help/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/help/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/help
+FCN_FILE_DIRS += \
+  scripts/help \
+  scripts/help/private
 
 scripts_help_PRIVATE_FCN_FILES = \
   scripts/help/private/__additional_help_message__.m \
@@ -15,11 +17,20 @@
   scripts/help/lookfor.m \
   scripts/help/print_usage.m \
   scripts/help/type.m \
-  scripts/help/which.m \
+  scripts/help/which.m
+
+scripts_helpdir = $(fcnfiledir)/help
+
+scripts_help_DATA = $(scripts_help_FCN_FILES)
+
+scripts_help_privatedir = $(fcnfiledir)/help/private
+
+scripts_help_private_DATA = $(scripts_help_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_help_FCN_FILES) \
   $(scripts_help_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_help_FCN_FILES)
-
 PKG_ADD_FILES += scripts/help/PKG_ADD
 
 DIRSTAMP_FILES += scripts/help/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/image/module.mk
--- a/scripts/image/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/image/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/image
+FCN_FILE_DIRS += \
+  scripts/image \
+  scripts/image/private
 
 scripts_image_PRIVATE_FCN_FILES = \
   scripts/image/private/__imfinfo__.m \
@@ -51,13 +53,22 @@
   scripts/image/spring.m \
   scripts/image/summer.m \
   scripts/image/white.m \
-  scripts/image/winter.m \
-  $(scripts_image_PRIVATE_FCN_FILES)
+  scripts/image/winter.m
 
 SCRIPTS_IMAGES += \
   scripts/image/default.img
 
-FCN_FILES += $(scripts_image_FCN_FILES)
+scripts_imagedir = $(fcnfiledir)/image
+
+scripts_image_DATA = $(scripts_image_FCN_FILES)
+
+scripts_image_privatedir = $(fcnfiledir)/image/private
+
+scripts_image_private_DATA = $(scripts_image_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_image_FCN_FILES) \
+  $(scripts_image_PRIVATE_FCN_FILES)
 
 PKG_ADD_FILES += scripts/image/PKG_ADD
 
diff -r 0e2da885a410 -r 916cc788d906 scripts/io/module.mk
--- a/scripts/io/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/io/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -12,6 +12,10 @@
   scripts/io/textscan.m \
   scripts/io/textread.m
 
+scripts_iodir = $(fcnfiledir)/io
+
+scripts_io_DATA = $(scripts_io_FCN_FILES)
+
 FCN_FILES += $(scripts_io_FCN_FILES)
 
 PKG_ADD_FILES += scripts/io/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/java/module.mk
--- a/scripts/java/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/java/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -11,14 +11,10 @@
   scripts/java/javarmpath.m \
   scripts/java/usejava.m
 
-FCN_FILES += $(scripts_java_FCN_FILES)
-
-PKG_ADD_FILES += scripts/java/PKG_ADD
+if AMCOND_HAVE_JAVA
+scripts_java_JAR_FILES = scripts/java/octave.jar
 
-DIRSTAMP_FILES += scripts/java/$(octave_dirstamp)
-
-if AMCOND_HAVE_JAVA
-JAR_FILES += scripts/java/octave.jar
+JAR_FILES += $(scripts_java_JAR_FILES)
 endif
 
 org_octave_dir = org/octave
@@ -53,7 +49,7 @@
 
 srcdir_scripts_java_JAVA_IMAGES = $(addprefix $(srcdir)/scripts/java/, $(JAVA_IMAGES))
 
-$(JAVA_CLASSES) : %.class : %.java
+$(scripts_java_JAVA_CLASSES) : %.class : %.java scripts/java/$(octave_dirstamp)
 	$(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
 	( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) )
 
@@ -72,9 +68,25 @@
 	mv $@-t $@
 endif
 
-EXTRA_DIST += $(JAR_FILES) $(scripts_java_JAVA_SRC) $(scripts_java_JAVA_IMAGES)
+EXTRA_DIST += \
+  $(scripts_java_JAR_FILES) \
+  $(scripts_java_JAVA_SRC) \
+  $(scripts_java_JAVA_IMAGES)
 
-CLEANFILES += $(JAR_FILES) $(scripts_java_JAVA_CLASSES)
+CLEANFILES += \
+  $(scripts_java_JAR_FILES) \
+  $(scripts_java_JAVA_CLASSES)
 
 DISTCLEANFILES += scripts/java/images.stamp
 
+scripts_javadir = $(fcnfiledir)/java
+
+scripts_java_DATA = \
+  $(scripts_java_FCN_FILES) \
+  $(scripts_java_JAR_FILES)
+
+FCN_FILES += $(scripts_java_FCN_FILES)
+
+PKG_ADD_FILES += scripts/java/PKG_ADD
+
+DIRSTAMP_FILES += scripts/java/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/linear-algebra/module.mk
--- a/scripts/linear-algebra/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/linear-algebra/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -31,6 +31,10 @@
   scripts/linear-algebra/trace.m \
   scripts/linear-algebra/vech.m
 
+scripts_linear_algebradir = $(fcnfiledir)/linear-algebra
+
+scripts_linear_algebra_DATA = $(scripts_linear_algebra_FCN_FILES)
+
 FCN_FILES += $(scripts_linear_algebra_FCN_FILES)
 
 PKG_ADD_FILES += scripts/linear-algebra/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/miscellaneous/module.mk
--- a/scripts/miscellaneous/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/miscellaneous/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/miscellaneous
+FCN_FILE_DIRS += \
+  scripts/miscellaneous \
+  scripts/miscellaneous/private
 
 scripts_miscellaneous_PRIVATE_FCN_FILES = \
   scripts/miscellaneous/private/display_info_file.m \
@@ -78,11 +80,20 @@
   scripts/miscellaneous/warning_ids.m \
   scripts/miscellaneous/what.m \
   scripts/miscellaneous/xor.m \
-  scripts/miscellaneous/zip.m \
+  scripts/miscellaneous/zip.m
+
+scripts_miscellaneousdir = $(fcnfiledir)/miscellaneous
+
+scripts_miscellaneous_DATA = $(scripts_miscellaneous_FCN_FILES)
+
+scripts_miscellaneous_privatedir = $(fcnfiledir)/miscellaneous/private
+
+scripts_miscellaneous_private_DATA = $(scripts_miscellaneous_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_miscellaneous_FCN_FILES) \
   $(scripts_miscellaneous_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_miscellaneous_FCN_FILES)
-
 PKG_ADD_FILES += scripts/miscellaneous/PKG_ADD
 
 DIRSTAMP_FILES += scripts/miscellaneous/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/module.mk
--- a/scripts/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -19,6 +19,10 @@
   scripts/@ftp/rmdir.m  \
   scripts/@ftp/saveobj.m
 
+scripts_@ftpdir = $(fcnfiledir)/@ftp/module.mk fails.  Is that an automake bug?
+
+scripts_@ftp_DATA = $(scripts_@ftp_FCN_FILES)
+
 FCN_FILES += $(scripts_@ftp_FCN_FILES)
 
 PKG_ADD_FILES += scripts/@ftp/PKG_ADD
@@ -59,8 +63,6 @@
 include scripts/testfun/module.mk
 include scripts/time/module.mk
 
-nobase_fcnfile_DATA = $(FCN_FILES) $(GEN_FCN_FILES) $(JAR_FILES)
-
 image_DATA += $(SCRIPTS_IMAGES)
 
 FCN_FILES_IN = $(GEN_FCN_FILES:.m=.in)
diff -r 0e2da885a410 -r 916cc788d906 scripts/optimization/module.mk
--- a/scripts/optimization/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/optimization/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/optimization
+FCN_FILE_DIRS += \
+  scripts/optimization \
+  scripts/optimization/private
 
 scripts_optimization_PRIVATE_FCN_FILES = \
   scripts/optimization/private/__fdjac__.m
@@ -16,11 +18,20 @@
   scripts/optimization/optimset.m \
   scripts/optimization/pqpnonneg.m \
   scripts/optimization/qp.m \
-  scripts/optimization/sqp.m \
+  scripts/optimization/sqp.m
+
+scripts_optimizationdir = $(fcnfiledir)/optimization
+
+scripts_optimization_DATA = $(scripts_optimization_FCN_FILES)
+
+scripts_optimization_privatedir = $(fcnfiledir)/optimization/private
+
+scripts_optimization_private_DATA = $(scripts_optimization_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_optimization_FCN_FILES) \
   $(scripts_optimization_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_optimization_FCN_FILES)
-
 PKG_ADD_FILES += scripts/optimization/PKG_ADD
 
 DIRSTAMP_FILES += scripts/optimization/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/path/module.mk
--- a/scripts/path/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/path/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/path
+FCN_FILE_DIRS += \
+  scripts/path \
+  scripts/path/private
 
 scripts_path_PRIVATE_FCN_FILES = \
   scripts/path/private/getsavepath.m
@@ -6,11 +8,20 @@
 scripts_path_FCN_FILES = \
   scripts/path/matlabroot.m \
   scripts/path/pathdef.m \
-  scripts/path/savepath.m \
+  scripts/path/savepath.m
+
+scripts_pathdir = $(fcnfiledir)/path
+
+scripts_path_DATA = $(scripts_path_FCN_FILES)
+
+scripts_path_privatedir = $(fcnfiledir)/path/private
+
+scripts_path_private_DATA = $(scripts_path_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_path_FCN_FILES) \
   $(scripts_path_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_path_FCN_FILES)
-
 PKG_ADD_FILES += scripts/path/PKG_ADD
 
 DIRSTAMP_FILES += scripts/path/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/pkg/module.mk
--- a/scripts/pkg/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/pkg/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/pkg
+FCN_FILE_DIRS += \
+  scripts/pkg \
+  scripts/pkg/private
 
 scripts_pkg_PRIVATE_FCN_FILES = \
   scripts/pkg/private/build.m \
@@ -40,13 +42,20 @@
   scripts/pkg/private/verify_directory.m \
   scripts/pkg/private/write_index.m
 
+scripts_pkg_FCN_FILES = scripts/pkg/pkg.m
 
-scripts_pkg_FCN_FILES = \
-  scripts/pkg/pkg.m \
+scripts_pkgdir = $(fcnfiledir)/pkg
+
+scripts_pkg_DATA = $(scripts_pkg_FCN_FILES)
+
+scripts_pkg_privatedir = $(fcnfiledir)/pkg/private
+
+scripts_pkg_private_DATA = $(scripts_pkg_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_pkg_FCN_FILES) \
   $(scripts_pkg_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_pkg_FCN_FILES)
-
 PKG_ADD_FILES += scripts/pkg/PKG_ADD
 
 DIRSTAMP_FILES += scripts/pkg/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/plot/appearance/module.mk
--- a/scripts/plot/appearance/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/plot/appearance/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/plot/appearance
+FCN_FILE_DIRS += \
+  scripts/plot/appearance \
+  scripts/plot/appearance/private
 
 scripts_plot_appearance_PRIVATE_FCN_FILES = \
   scripts/plot/appearance/private/__axis_limits__.m \
@@ -32,11 +34,20 @@
   scripts/plot/appearance/ylabel.m \
   scripts/plot/appearance/ylim.m \
   scripts/plot/appearance/zlabel.m \
-  scripts/plot/appearance/zlim.m \
+  scripts/plot/appearance/zlim.m
+
+scripts_plot_appearancedir = $(fcnfiledir)/plot/appearance
+
+scripts_plot_appearance_DATA = $(scripts_plot_appearance_FCN_FILES)
+
+scripts_plot_appearance_privatedir = $(fcnfiledir)/plot/appearance/private
+
+scripts_plot_appearance_private_DATA = $(scripts_plot_appearance_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_plot_appearance_FCN_FILES) \
   $(scripts_plot_appearance_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_plot_appearance_FCN_FILES)
-
 PKG_ADD_FILES += scripts/plot/appearance/PKG_ADD
 
 DIRSTAMP_FILES += scripts/plot/appearance/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/plot/draw/module.mk
--- a/scripts/plot/draw/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/plot/draw/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/plot/draw
+FCN_FILE_DIRS += \
+  scripts/plot/draw \
+  scripts/plot/draw/private
 
 scripts_plot_draw_PRIVATE_FCN_FILES = \
   scripts/plot/draw/private/__add_datasource__.m \
@@ -93,11 +95,20 @@
   scripts/plot/draw/trimesh.m \
   scripts/plot/draw/triplot.m \
   scripts/plot/draw/trisurf.m \
-  scripts/plot/draw/waterfall.m \
+  scripts/plot/draw/waterfall.m
+
+scripts_plot_drawdir = $(fcnfiledir)/plot/draw
+
+scripts_plot_draw_DATA = $(scripts_plot_draw_FCN_FILES)
+
+scripts_plot_draw_privatedir = $(fcnfiledir)/plot/draw/private
+
+scripts_plot_draw_private_DATA = $(scripts_plot_draw_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_plot_draw_FCN_FILES) \
   $(scripts_plot_draw_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_plot_draw_FCN_FILES)
-
 PKG_ADD_FILES += scripts/plot/draw/PKG_ADD
 
 DIRSTAMP_FILES += scripts/plot/draw/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/plot/util/module.mk
--- a/scripts/plot/util/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/plot/util/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/plot/util
+FCN_FILE_DIRS += \
+  scripts/plot/util \
+  scripts/plot/util/private
 
 scripts_plot_util_GEN_FCN_FILES = \
   scripts/plot/util/gnuplot_binary.m
@@ -77,11 +79,23 @@
   scripts/plot/util/shg.m \
   scripts/plot/util/struct2hdl.m \
   scripts/plot/util/subplot.m \
-  scripts/plot/util/zoom.m \
+  scripts/plot/util/zoom.m
+
+scripts_plot_utildir = $(fcnfiledir)/plot/util
+
+scripts_plot_util_DATA = \
+  $(scripts_plot_util_FCN_FILES) \
+  $(scripts_plot_util_GEN_FCN_FILES)
+
+scripts_plot_util_privatedir = $(fcnfiledir)/plot/util/private
+
+scripts_plot_util_private_DATA = $(scripts_plot_util_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_plot_util_FCN_FILES) \
+  $(scripts_plot_util_GEN_FCN_FILES) \
   $(scripts_plot_util_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_plot_util_FCN_FILES)
-
 PKG_ADD_FILES += scripts/plot/util/PKG_ADD
 
 DIRSTAMP_FILES += scripts/plot/util/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/polynomial/module.mk
--- a/scripts/polynomial/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/polynomial/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/polynomial
+FCN_FILE_DIRS += \
+  scripts/polynomial \
+  scripts/polynomial/private
 
 scripts_polynomial_PRIVATE_FCN_FILES = \
   scripts/polynomial/private/__splinefit__.m
@@ -29,11 +31,20 @@
   scripts/polynomial/roots.m \
   scripts/polynomial/spline.m \
   scripts/polynomial/splinefit.m \
-  scripts/polynomial/unmkpp.m \
+  scripts/polynomial/unmkpp.m
+
+scripts_polynomialdir = $(fcnfiledir)/polynomial
+
+scripts_polynomial_DATA = $(scripts_polynomial_FCN_FILES)
+
+scripts_polynomial_privatedir = $(fcnfiledir)/polynomial/private
+
+scripts_polynomial_private_DATA = $(scripts_polynomial_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_polynomial_FCN_FILES) \
   $(scripts_polynomial_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_polynomial_FCN_FILES)
-
 PKG_ADD_FILES += scripts/polynomial/PKG_ADD
 
 DIRSTAMP_FILES += scripts/polynomial/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/prefs/module.mk
--- a/scripts/prefs/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/prefs/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/prefs
+FCN_FILE_DIRS += \
+  scripts/prefs \
+  scripts/prefs/private
 
 scripts_prefs_PRIVATE_FCN_FILES = \
   scripts/prefs/private/loadprefs.m \
@@ -12,11 +14,20 @@
   scripts/prefs/prefdir.m \
   scripts/prefs/preferences.m \
   scripts/prefs/rmpref.m \
-  scripts/prefs/setpref.m \
+  scripts/prefs/setpref.m
+
+scripts_prefsdir = $(fcnfiledir)/prefs
+
+scripts_prefs_DATA = $(scripts_prefs_FCN_FILES)
+
+scripts_prefs_privatedir = $(fcnfiledir)/prefs/private
+
+scripts_prefs_private_DATA = $(scripts_prefs_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_prefs_FCN_FILES) \
   $(scripts_prefs_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_prefs_FCN_FILES)
-
 PKG_ADD_FILES += scripts/prefs/PKG_ADD
 
 DIRSTAMP_FILES += scripts/prefs/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/set/module.mk
--- a/scripts/set/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/set/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -10,6 +10,10 @@
   scripts/set/unique.m \
   scripts/set/private/validsetargs.m
 
+scripts_setdir = $(fcnfiledir)/set
+
+scripts_set_DATA = $(scripts_set_FCN_FILES)
+
 FCN_FILES += $(scripts_set_FCN_FILES)
 
 PKG_ADD_FILES += scripts/set/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/signal/module.mk
--- a/scripts/signal/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/signal/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/signal
+FCN_FILE_DIRS += \
+  scripts/signal \
+  scripts/signal/private
 
 scripts_signal_PRIVATE_FCN_FILES = \
   scripts/signal/private/rectangle_lw.m  \
@@ -38,11 +40,20 @@
   scripts/signal/stft.m \
   scripts/signal/synthesis.m \
   scripts/signal/unwrap.m \
-  scripts/signal/yulewalker.m \
+  scripts/signal/yulewalker.m
+
+scripts_signaldir = $(fcnfiledir)/signal
+
+scripts_signal_DATA = $(scripts_signal_FCN_FILES)
+
+scripts_signal_privatedir = $(fcnfiledir)/signal/private
+
+scripts_signal_private_DATA = $(scripts_signal_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_signal_FCN_FILES) \
   $(scripts_signal_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_signal_FCN_FILES)
-
 PKG_ADD_FILES += scripts/signal/PKG_ADD
 
 DIRSTAMP_FILES += scripts/signal/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/sparse/module.mk
--- a/scripts/sparse/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/sparse/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/sparse
+FCN_FILE_DIRS += \
+  scripts/sparse \
+  scripts/sparse/private
 
 scripts_sparse_PRIVATE_FCN_FILES = \
   scripts/sparse/private/__sprand_impl__.m
@@ -31,11 +33,20 @@
   scripts/sparse/spy.m \
   scripts/sparse/svds.m \
   scripts/sparse/treelayout.m \
-  scripts/sparse/treeplot.m \
+  scripts/sparse/treeplot.m
+
+scripts_sparsedir = $(fcnfiledir)/sparse
+
+scripts_sparse_DATA = $(scripts_sparse_FCN_FILES)
+
+scripts_sparse_privatedir = $(fcnfiledir)/sparse/private
+
+scripts_sparse_private_DATA = $(scripts_sparse_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_sparse_FCN_FILES) \
   $(scripts_sparse_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_sparse_FCN_FILES)
-
 PKG_ADD_FILES += scripts/sparse/PKG_ADD
 
 DIRSTAMP_FILES += scripts/sparse/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/specfun/module.mk
--- a/scripts/specfun/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/specfun/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -20,6 +20,10 @@
   scripts/specfun/realpow.m \
   scripts/specfun/realsqrt.m
 
+scripts_specfundir = $(fcnfiledir)/specfun
+
+scripts_specfun_DATA = $(scripts_specfun_FCN_FILES)
+
 FCN_FILES += $(scripts_specfun_FCN_FILES)
 
 PKG_ADD_FILES += scripts/specfun/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/special-matrix/module.mk
--- a/scripts/special-matrix/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/special-matrix/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -13,6 +13,10 @@
   scripts/special-matrix/vander.m \
   scripts/special-matrix/wilkinson.m
 
+scripts_special_matrixdir = $(fcnfiledir)/special-matrix
+
+scripts_special_matrix_DATA = $(scripts_special_matrix_FCN_FILES)
+
 FCN_FILES += $(scripts_special_matrix_FCN_FILES)
 
 PKG_ADD_FILES += scripts/special-matrix/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/startup/module.mk
--- a/scripts/startup/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/startup/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -14,12 +14,16 @@
   $(SYSTEM_STARTUP_FILE_SRC) \
   $(SYSTEM_INPUTRC_FILE_SRC)
 
-FCN_FILES += \
-  $(scripts_startup_FCN_FILES)
+scripts_startupdir = $(fcnfiledir)/startup
 
-EXTRA_DIST += \
+scripts_startup_DATA = \
+  $(scripts_startup_FCN_FILES) \
   $(STARTUP_FILE_SRC)
 
+FCN_FILES += $(scripts_startup_FCN_FILES)
+
+EXTRA_DIST += $(STARTUP_FILE_SRC)
+
 PKG_ADD_FILES += scripts/startup/PKG_ADD
 
 DIRSTAMP_FILES += scripts/startup/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/statistics/base/module.mk
--- a/scripts/statistics/base/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/statistics/base/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -36,6 +36,10 @@
   scripts/statistics/base/var.m \
   scripts/statistics/base/zscore.m
 
+scripts_statistics_basedir = $(fcnfiledir)/statistics/base
+
+scripts_statistics_base_DATA = $(scripts_statistics_base_FCN_FILES)
+
 FCN_FILES += $(scripts_statistics_base_FCN_FILES)
 
 PKG_ADD_FILES += scripts/statistics/base/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/statistics/distributions/module.mk
--- a/scripts/statistics/distributions/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/statistics/distributions/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -92,6 +92,10 @@
   scripts/statistics/distributions/wblrnd.m \
   scripts/statistics/distributions/wienrnd.m
 
+scripts_statistics_distributionsdir = $(fcnfiledir)/statistics/distributions
+
+scripts_statistics_distributions_DATA = $(scripts_statistics_distributions_FCN_FILES)
+
 FCN_FILES += $(scripts_statistics_distributions_FCN_FILES)
 
 PKG_ADD_FILES += scripts/statistics/distributions/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/statistics/models/module.mk
--- a/scripts/statistics/models/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/statistics/models/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -1,15 +1,26 @@
-FCN_FILE_DIRS += scripts/statistics/models
+FCN_FILE_DIRS += \
+  scripts/statistics/models \
+  scripts/statistics/models/private
 
 scripts_statistics_models_PRIVATE_FCN_FILES = \
   scripts/statistics/models/private/logistic_regression_derivatives.m \
   scripts/statistics/models/private/logistic_regression_likelihood.m
 
 scripts_statistics_models_FCN_FILES = \
-  scripts/statistics/models/logistic_regression.m \
+  scripts/statistics/models/logistic_regression.m
+
+scripts_statistics_modelsdir = $(fcnfiledir)/statistics/models
+
+scripts_statistics_models_DATA = $(scripts_statistics_models_FCN_FILES)
+
+scripts_statistics_models_privatedir = $(fcnfiledir)/statistics/models/private
+
+scripts_statistics_models_private_DATA = $(scripts_statistics_models_PRIVATE_FCN_FILES)
+
+FCN_FILES += \
+  $(scripts_statistics_models_FCN_FILES) \
   $(scripts_statistics_models_PRIVATE_FCN_FILES)
 
-FCN_FILES += $(scripts_statistics_models_FCN_FILES)
-
 PKG_ADD_FILES += scripts/statistics/models/PKG_ADD
 
 DIRSTAMP_FILES += scripts/statistics/models/$(octave_dirstamp)
diff -r 0e2da885a410 -r 916cc788d906 scripts/statistics/tests/module.mk
--- a/scripts/statistics/tests/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/statistics/tests/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -27,6 +27,10 @@
   scripts/statistics/tests/z_test.m \
   scripts/statistics/tests/z_test_2.m
 
+scripts_statistics_testsdir = $(fcnfiledir)/statistics/tests
+
+scripts_statistics_tests_DATA = $(scripts_statistics_tests_FCN_FILES)
+
 FCN_FILES += $(scripts_statistics_tests_FCN_FILES)
 
 PKG_ADD_FILES += scripts/statistics/tests/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/strings/module.mk
--- a/scripts/strings/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/strings/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -32,6 +32,10 @@
   scripts/strings/untabify.m \
   scripts/strings/validatestring.m
 
+scripts_stringsdir = $(fcnfiledir)/strings
+
+scripts_strings_DATA = $(scripts_strings_FCN_FILES)
+
 FCN_FILES += $(scripts_strings_FCN_FILES)
 
 PKG_ADD_FILES += scripts/strings/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/testfun/module.mk
--- a/scripts/testfun/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/testfun/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -14,6 +14,10 @@
   scripts/testfun/speed.m \
   scripts/testfun/test.m
 
+scripts_testfundir = $(fcnfiledir)/testfun
+
+scripts_testfun_DATA = $(scripts_testfun_FCN_FILES)
+
 FCN_FILES += $(scripts_testfun_FCN_FILES)
 
 PKG_ADD_FILES += scripts/testfun/PKG_ADD
diff -r 0e2da885a410 -r 916cc788d906 scripts/time/module.mk
--- a/scripts/time/module.mk	Tue Jul 14 00:01:59 2015 -0400
+++ b/scripts/time/module.mk	Tue Jul 14 10:55:51 2015 -0400
@@ -16,6 +16,10 @@
   scripts/time/now.m \
   scripts/time/weekday.m
 
+scripts_timedir = $(fcnfiledir)/time
+
+scripts_time_DATA = $(scripts_time_FCN_FILES)
+
 FCN_FILES += $(scripts_time_FCN_FILES)
 
 PKG_ADD_FILES += scripts/time/PKG_ADD