mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Generate GNUstep.conf and install it
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21802 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
f7c4c012bb
commit
72b76ae115
6 changed files with 40 additions and 31 deletions
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2005-10-12 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* configure.ac: Generate GNUstep.conf from GNUstep.conf.in
|
||||
so that GNUstep.conf gets properly setup with the paths that
|
||||
are configured into gnustep-make
|
||||
* GNUstep.conf.in: New file.
|
||||
* GNUstep.conf: Removed.
|
||||
* configure: Regenerated.
|
||||
* GNUmakefile.in (install): Install the GNUstep.conf file
|
||||
in the chosen location for the GNUstep config file.
|
||||
|
||||
2005-10-12 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* configure.ac: Added --with-config-file=xxx (code partially taken
|
||||
|
|
|
|||
|
|
@ -33,6 +33,8 @@ include config.make
|
|||
# install special_prefix=/var/tmp/gnustep-make'
|
||||
special_prefix =
|
||||
|
||||
GNUSTEP_CONFIG_FILE = $(special_prefix)@gnustep_config_file@
|
||||
GNUSTEP_CONFIG_FILE_DIR = $(dir $(GNUSTEP_CONFIG_FILE))
|
||||
GNUSTEP_SYSTEM_ROOT = $(special_prefix)@prefix@
|
||||
GNUSTEP_LOCAL_ROOT = $(special_prefix)@GNUSTEP_LOCAL_ROOT@
|
||||
GNUSTEP_NETWORK_ROOT = $(special_prefix)@GNUSTEP_NETWORK_ROOT@
|
||||
|
|
@ -143,6 +145,9 @@ install: all @GNUSTEP_MOVE_OBSOLETE@
|
|||
$(makedir)/Instance \
|
||||
$(makedir)/Instance/Shared \
|
||||
$(makedir)/Instance/Documentation)
|
||||
$(EC)(echo "Installing GNUstep configuration file in $(GNUSTEP_CONFIG_FILE)"; \
|
||||
$(srcdir)/mkinstalldirs $(GNUSTEP_CONFIG_FILE_DIR); \
|
||||
$(INSTALL_DATA) $(srcdir)/GNUstep.conf $(GNUSTEP_CONFIG_FILE))
|
||||
-$(EC) rm -f $(GNUSTEP_SYSTEM_ROOT)/Makefiles
|
||||
$(EC)(echo "Installing gnustep-make support software"; \
|
||||
$(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) \
|
||||
|
|
|
|||
29
GNUstep.conf
29
GNUstep.conf
|
|
@ -1,29 +0,0 @@
|
|||
#
|
||||
# Example GNUstep.conf file. Please customize for your use
|
||||
# and place in the appropriate configuration directory (which depends
|
||||
# on the operating system or the --config-file argument passed to gnustep-base
|
||||
# configure.)
|
||||
#
|
||||
GNUSTEP_SYSTEM_ROOT = /usr/GNUstep/System
|
||||
GNUSTEP_LOCAL_ROOT = /usr/GNUstep/Local
|
||||
GNUSTEP_NETWORK_ROOT = /usr/GNUstep/Local
|
||||
|
||||
USER_GNUSTEP_DIR = GNUstep
|
||||
USER_GNUSTEP_DEFAULTS = Defaults
|
||||
USER_GNUSTEP_RC = .GNUsteprc
|
||||
|
||||
SYS_APPS = /bin
|
||||
SYS_LIBS = /lib
|
||||
SYS_PREFS = /etc
|
||||
SYS_ADMIN = /sbin
|
||||
|
||||
PLATFORM_APPS = /usr/bin
|
||||
PLATFORM_LIBS = /usr/lib
|
||||
PLATFORM_ADMIN = /usr/sbin
|
||||
PLATFORM_RESOURCES = /usr/share
|
||||
|
||||
PLATFORM_LOCAL_APPS = /usr/local/bin
|
||||
PLATFORM_LOCAL_LIBS = /usr/local/libs
|
||||
PLATFORM_LOCAL_ADMIN = /usr/local/sbin
|
||||
PLATFORM_LOCAL_RESOURCES = /usr/local/share
|
||||
|
||||
21
GNUstep.conf.in
Normal file
21
GNUstep.conf.in
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
##
|
||||
## This is the GNUstep configuration file.
|
||||
##
|
||||
|
||||
## Any line starting with a '#' is a comment.
|
||||
## Empty lines are ignored.
|
||||
## Every other line in this file must be of the form
|
||||
## XXX=YYY
|
||||
## where there should be no spaces around the '=' (this is because we
|
||||
## include this file in shell scripts and makefiles, and sh syntax
|
||||
## requires no spaces around the '=').
|
||||
|
||||
GNUSTEP_SYSTEM_ROOT=@prefix@
|
||||
GNUSTEP_LOCAL_ROOT=@GNUSTEP_LOCAL_ROOT@
|
||||
GNUSTEP_NETWORK_ROOT=@GNUSTEP_NETWORK_ROOT@
|
||||
|
||||
# FIXME these needs doing still, special work to do on rationalizing
|
||||
# and standardizing user dirs and defaults
|
||||
#USER_GNUSTEP_DIR = GNUstep
|
||||
#USER_GNUSTEP_DEFAULTS = Defaults
|
||||
#USER_GNUSTEP_RC = .GNUsteprc
|
||||
3
configure
vendored
3
configure
vendored
|
|
@ -4973,7 +4973,7 @@ clean_target_vendor=`$srcdir/clean_cpu.sh $target_vendor`
|
|||
#--------------------------------------------------------------------
|
||||
# Produce the output files
|
||||
#--------------------------------------------------------------------
|
||||
ac_config_files="$ac_config_files config.make openapp debugapp opentool executable.template GNUmakefile GNUstep.sh GNUstep.csh fixpath.sh gnustep-make.spec GNUsteprc"
|
||||
ac_config_files="$ac_config_files config.make openapp debugapp opentool executable.template GNUmakefile GNUstep.conf GNUstep.sh GNUstep.csh fixpath.sh gnustep-make.spec GNUsteprc"
|
||||
|
||||
ac_config_commands="$ac_config_commands default"
|
||||
|
||||
|
|
@ -5518,6 +5518,7 @@ do
|
|||
"opentool" ) CONFIG_FILES="$CONFIG_FILES opentool" ;;
|
||||
"executable.template" ) CONFIG_FILES="$CONFIG_FILES executable.template" ;;
|
||||
"GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;;
|
||||
"GNUstep.conf" ) CONFIG_FILES="$CONFIG_FILES GNUstep.conf" ;;
|
||||
"GNUstep.sh" ) CONFIG_FILES="$CONFIG_FILES GNUstep.sh" ;;
|
||||
"GNUstep.csh" ) CONFIG_FILES="$CONFIG_FILES GNUstep.csh" ;;
|
||||
"fixpath.sh" ) CONFIG_FILES="$CONFIG_FILES fixpath.sh" ;;
|
||||
|
|
|
|||
|
|
@ -687,7 +687,7 @@ AC_SUBST(target)
|
|||
# Produce the output files
|
||||
#--------------------------------------------------------------------
|
||||
AC_CONFIG_FILES([config.make openapp debugapp opentool
|
||||
executable.template GNUmakefile GNUstep.sh GNUstep.csh fixpath.sh
|
||||
executable.template GNUmakefile GNUstep.conf GNUstep.sh GNUstep.csh fixpath.sh
|
||||
gnustep-make.spec GNUsteprc])
|
||||
AC_CONFIG_COMMANDS([default],
|
||||
[[chmod a+x openapp debugapp opentool fixpath.sh executable.template]],
|
||||
|
|
|
|||
Loading…
Reference in a new issue