Mercurial > hg > octave-max

changeset 12721:65faec78a5b3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Don't install main-rcfile, local-rcfile but do distribute them in tarball. startup/module.mk: Don't install rcfiles. They are installed by special Makefile rules which rename them to octaverc and place them in the correct directory.
author Rik <octave@nomad.inbox5.com>
date Mon, 25 Apr 2011 10:51:09 -0700
parents ccfe03bebeba
children 6ed1e0be181e
files scripts/startup/module.mk
diffstat 1 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/startup/module.mk
+++ b/scripts/startup/module.mk
@@ -3,24 +3,22 @@
 startup_FCN_FILES = \
   startup/__finish__.m
 
+LOCAL_STARTUP_FILE_SRC  = startup/local-rcfile
+
 SYSTEM_STARTUP_FILE_SRC = startup/main-rcfile
 
 SYSTEM_INPUTRC_FILE_SRC = startup/inputrc
 
-LOCAL_STARTUP_FILE_SRC = startup/local-rcfile
-
 STARTUP_FILE_SRC = \
+  $(LOCAL_STARTUP_FILE_SRC) \
   $(SYSTEM_STARTUP_FILE_SRC) \
-  $(SYSTEM_INPUTRC_FILE_SRC) \
-  $(LOCAL_STARTUP_FILE_SRC)
+  $(SYSTEM_INPUTRC_FILE_SRC)
 
 FCN_FILES += \
-  $(startup_FCN_FILES) \
-  $(SYSTEM_STARTUP_FILE_SRC) \
-  $(LOCAL_STARTUP_FILE_SRC)
+  $(startup_FCN_FILES)
 
 EXTRA_DIST += \
-  $(SYSTEM_INPUTRC_FILE_SRC)
+  $(STARTUP_FILE_SRC)
 
 PKG_ADD_FILES += startup/PKG_ADD