Mercurial > octave-nkf
changeset 20390:e365a34a1c5c
Fix more installation discrepancies in scripts directory
* scripts/module.mk (scripts_@ftpdir): Fix definition.
(install-pkg-add): Strip "scripts/" prefix when installing PKG_ADD files.
* scripts/set/module.mk (FCN_FILE_DIRS): Add scripts/set/private.
(scripts_set_FCN_FILES) Remove scripts/set/private/validsetargs.m from
the list. (scripts_set_PRIVATE_FCN_FILES, scripts_set_privatedir,
scripts_set_private_DATA): New variables.
(FCN_FILES): Add $(scripts_set_PRIVATE_FCN_FILES) to the list.
* scripts/startup/module.mk (scripts_startup_DATA) Remove
$(STARTUP_FILE_SRC) from the list.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Thu, 16 Jul 2015 01:18:40 -0400 |
| parents | 456c7e4cb34d |
| children | d2c03beac955 |
| files | scripts/module.mk scripts/set/module.mk scripts/startup/module.mk |
| diffstat | 3 files changed, 18 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/module.mk Wed Jul 15 16:57:40 2015 -0400 +++ b/scripts/module.mk Thu Jul 16 01:18:40 2015 -0400 @@ -19,7 +19,7 @@ scripts/@ftp/rmdir.m \ scripts/@ftp/saveobj.m -scripts_@ftpdir = $(fcnfiledir)/@ftp/module.mk fails. Is that an automake bug? +scripts_@ftpdir = $(fcnfiledir)/@ftp scripts_@ftp_DATA = $(scripts_@ftp_FCN_FILES) @@ -180,8 +180,9 @@ install-pkg-add: for f in $(PKG_ADD_FILES); do \ if [ -n "`cat $$f`" ]; then \ - $(MKDIR_P) $(DESTDIR)$(fcnfiledir)/`echo $$f | $(SED) 's,/[^/]*$$,,'`; \ - $(INSTALL_DATA) $$f $(DESTDIR)$(fcnfiledir)/$$f; \ + base=`echo $$f | $(SED) 's,^scripts/,,'`; \ + $(MKDIR_P) $(DESTDIR)$(fcnfiledir)/`echo $$base | $(SED) 's,/[^/]*$$,,'`; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(fcnfiledir)/$$base; \ fi \ done .PHONY: install-pkg-add
--- a/scripts/set/module.mk Wed Jul 15 16:57:40 2015 -0400 +++ b/scripts/set/module.mk Thu Jul 16 01:18:40 2015 -0400 @@ -1,4 +1,8 @@ -FCN_FILE_DIRS += scripts/set +FCN_FILE_DIRS += \ + scripts/set \ + scripts/set/private + +scripts_set_PRIVATE_FCN_FILES = scripts/set/private/validsetargs.m scripts_set_FCN_FILES = \ scripts/set/intersect.m \ @@ -7,14 +11,19 @@ scripts/set/setdiff.m \ scripts/set/setxor.m \ scripts/set/union.m \ - scripts/set/unique.m \ - scripts/set/private/validsetargs.m + scripts/set/unique.m scripts_setdir = $(fcnfiledir)/set scripts_set_DATA = $(scripts_set_FCN_FILES) -FCN_FILES += $(scripts_set_FCN_FILES) +scripts_set_privatedir = $(fcnfiledir)/set/private + +scripts_set_private_DATA = $(scripts_set_PRIVATE_FCN_FILES) + +FCN_FILES += \ + $(scripts_set_FCN_FILES) \ + $(scripts_set_PRIVATE_FCN_FILES) PKG_ADD_FILES += scripts/set/PKG_ADD
--- a/scripts/startup/module.mk Wed Jul 15 16:57:40 2015 -0400 +++ b/scripts/startup/module.mk Thu Jul 16 01:18:40 2015 -0400 @@ -16,9 +16,7 @@ scripts_startupdir = $(fcnfiledir)/startup -scripts_startup_DATA = \ - $(scripts_startup_FCN_FILES) \ - $(STARTUP_FILE_SRC) +scripts_startup_DATA = $(scripts_startup_FCN_FILES) FCN_FILES += $(scripts_startup_FCN_FILES)