Skip to content

Commit

Permalink
Install strict v2 GNUstep.conf file when running in strict v2 mode; i…
Browse files Browse the repository at this point in the history
…mproved a little the GNUmakefile.in messages

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@25950 72102866-910b-0410-8b05-ffd578937521
  • Loading branch information
nicola committed Jan 15, 2008
1 parent a47743d commit 6f044ae
Show file tree
Hide file tree
Showing 5 changed files with 188 additions and 7 deletions.
16 changes: 16 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
2008-01-15 Nicola Pero <[email protected]>

* GNUstep-strict-v2.conf.in: New file which is a "strict
gnustep-make v2" version of GNUstep.conf.in, with all the obsolete
v1 variables removed.
* configure.ac: Create GNUstep-strict-v2.conf file from
GNUstep-strict-v2.conf.in.
* configure: Regenerated.
* GNUmakefile.in: Install GNUstep-strict-v2.conf as configuration
file instead of GNUstep.conf when running in strict v2 mode.

* GNUmakefile.in (all): Updated message, mentioning that you need
to type 'make install' to install.
(install): Updated message for installing manpages mentioning that
we are compressing them on the fly.

2008-01-14 Nicola Pero <[email protected]>

* GNUmakefile.in: Disable built-in suffixes and vague % rules for
Expand Down
23 changes: 18 additions & 5 deletions GNUmakefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,24 @@ INSTANCE_SHARED_MAKE_FILES = bundle.make headers.make java.make \
INSTANCE_DOC_MAKE_FILES = autogsdoc.make gsdoc.make install_files.make \
javadoc.make latex.make texi.make

# Decide which version of the GNUstep.conf file we are going to
# install; the standard one, or the strict gnustep-make v2 one ?
ifeq ($(GNUSTEP_MAKE_STRICT_V2_MODE),yes)
GNUSTEP_DOT_CONF_FILE = GNUstep-strict-v2.conf
else
GNUSTEP_DOT_CONF_FILE = GNUstep.conf
endif

# You can type 'make messages=yes' to see exactly which commands are
# being executed. Else we only print a summary description.
ifeq ($(messages),yes)
EC =
else
EC = @
endif

all: generated-files
$(EC)(echo "Thanks. All is ready to install.")
$(EC)(echo "Thanks. All is ready: type 'make install' to install gnustep-make.")

install: generated-files
$(EC)(echo "Creating system tools directory: $(tooldir)"; \
Expand All @@ -164,7 +174,7 @@ install: generated-files
"$(makedir)/Instance/Documentation")
$(EC)(echo "Installing GNUstep configuration file in $(GNUSTEP_CONFIG_FILE)"; \
"$(srcdir)/mkinstalldirs" "$(GNUSTEP_CONFIG_FILE_DIR)"; \
$(INSTALL_DATA) GNUstep.conf "$(GNUSTEP_CONFIG_FILE)")
$(INSTALL_DATA) $(GNUSTEP_DOT_CONF_FILE) "$(GNUSTEP_CONFIG_FILE)")
$(EC)(echo "Installing gnustep-make support software")
$(EC)(for f in config.guess config.sub install-sh mkinstalldirs \
clean_cpu.sh clean_os.sh \
Expand Down Expand Up @@ -209,7 +219,7 @@ install: generated-files
$(INSTALL_DATA) config-noarch.make "$(makedir)"; \
$(INSTALL_DATA) filesystem.make "$(makedir)"; \
$(INSTALL_DATA) config.make "$(makedir)/$(GNUSTEP_TARGET_LDIR)")
$(EC)(echo "Installing manpages"; \
$(EC)(echo "Installing (and compressing) manpages"; \
"$(srcdir)/mkinstalldirs" "$(mandir)/man1" \
"$(mandir)/man7"; \
$(INSTALL_DATA) "$(srcdir)/Documentation/debugapp.1" "$(mandir)/man1"; \
Expand Down Expand Up @@ -301,7 +311,7 @@ distclean: clean
rm -f openapp opentool executable.template
rm -f GNUstep.sh GNUstep.csh fixpath.sh gnustep-config
rm -f filesystem.make filesystem.sh filesystem.csh
rm -f gnustep-make.spec GNUstep.conf
rm -f gnustep-make.spec GNUstep.conf GNUstep-strict-v2.conf
rm -f config-precomp-test.out config-precomp-test.h.gch config-precomp-test.log

svn-tag:
Expand Down Expand Up @@ -368,7 +378,7 @@ rpm: test-RPM_TOPDIR dist

generated-files: GNUmakefile GNUstep.sh GNUstep.csh fixpath.sh config-noarch.make config.make \
openapp opentool gnustep-make.spec executable.template gnustep-config \
filesystem.make filesystem.sh filesystem.csh GNUstep.conf
filesystem.make filesystem.sh filesystem.csh GNUstep.conf GNUstep-strict-v2.conf

GNUmakefile: GNUmakefile.in config.status
$(SHELL) config.status
Expand All @@ -382,6 +392,9 @@ GNUstep.csh: GNUstep.csh.in
GNUstep.conf: GNUstep.conf.in
$(SHELL) config.status

GNUstep-strict-v2.conf: GNUstep-strict-v2.conf.in
$(SHELL) config.status

fixpath.sh: fixpath.sh.in
$(SHELL) config.status

Expand Down
151 changes: 151 additions & 0 deletions GNUstep-strict-v2.conf.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
# This is the GNUstep configuration file.

# This is the "strict version 2 mode" version of the file, which is
# identical to the normal one, but all the obsolete v1 variables
# (GNUSTEP_SYSTEM_ROOT, GNUSTEP_LOCAL_ROOT, GNUSTEP_NETWORK_ROOT,
# GNUSTEP_USER_DIR) have been removed.

# 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 '=').
#
# Standard sh quotes can be used in YYY but only at runtime; they can
# not be used while building.

# GNUstep can use up to 4 domains at the same time. They are System,
# Local, Network and User. You can install your programs / resources
# in any of these domains. This file mostly deals with configuring
# how the domains map to your filesystem.

# IMPORTANT: Don't delete lines from this file unless you want
# the values hardcoded in the packages to be used. If you want
# to suppress the network domain, set all its paths to be the same
# as the system domain. If you want to suppress the local domain,
# set all its paths to be the same as the network domain. If you
# want to suppress the user domain, set its paths to be the same
# as the local domain. You can not suppress the system domain.

# The paths should not include a '/' at the end.

# The name of the user config file. This file can override
# some settings in this file. Usually used by users that want
# to install things into their GNUstep user domain and/or have
# many such domains.
GNUSTEP_USER_CONFIG_FILE=@GNUSTEP_USER_CONFIG_FILE@

# The name of the user directory where defaults (eg, preferences) are
# stored. If it does not start with a '/', it will be considered
# relative to the user home directory.
GNUSTEP_USER_DEFAULTS_DIR=@GNUSTEP_USER_DEFAULTS_DIR@


# This is where the gnustep-make Makefiles are installed.
# Traditionally, this is /usr/GNUstep/System/Library/Makefiles
GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@


# This is where the user home directories are. Only used to provide
# NSUserDirectory in gnustep-base. Never used anywhere else.
GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@
GNUSTEP_NETWORK_USERS_DIR=@GNUSTEP_NETWORK_USERS_DIR@
GNUSTEP_LOCAL_USERS_DIR=@GNUSTEP_LOCAL_USERS_DIR@


# This is where System GUI Applications get installed.
# Traditionally it is /usr/GNUstep/System/Applications.
GNUSTEP_SYSTEM_APPS=@GNUSTEP_SYSTEM_APPS@

# This is where System GUI Applications that only the
# Administrator can use get installed.
# Traditionally it is /usr/GNUstep/System/Applications/Admin.
GNUSTEP_SYSTEM_ADMIN_APPS=@GNUSTEP_SYSTEM_ADMIN_APPS@

# This is where System Web Applications (GSWeb, SOPE) get
# installed.
# Traditionally it is /usr/GNUstep/System/Library/WebApplications.
GNUSTEP_SYSTEM_WEB_APPS=@GNUSTEP_SYSTEM_WEB_APPS@

# This is where System Command-Line Tools get installed.
# Traditionally it is /usr/GNUstep/System/Tools.
GNUSTEP_SYSTEM_TOOLS=@GNUSTEP_SYSTEM_TOOLS@

# This is where System Command-Line Tools that only the
# Administrator can use get installed. Important: this
# should not be in the PATH of normal users.
# Traditionally it is /usr/GNUstep/System/Tools/Admin.
GNUSTEP_SYSTEM_ADMIN_TOOLS=@GNUSTEP_SYSTEM_ADMIN_TOOLS@

# This is where System resources get installed. This directory will
# contain a lot of executable code since *step traditionally likes to
# bundle executables and resources together.
# Traditionally it is /usr/GNUstep/System/Library.
GNUSTEP_SYSTEM_LIBRARY=@GNUSTEP_SYSTEM_LIBRARY@

# This is where System headers get installed. They are the
# library .h headers.
# Traditionally it is /usr/GNUstep/System/Library/Headers.
GNUSTEP_SYSTEM_HEADERS=@GNUSTEP_SYSTEM_HEADERS@

# This is where System libraries get installed. By libraries we mean
# the shared/static object files that you can link into programs.
# Traditionally it is /usr/GNUstep/System/Library/Libraries.
GNUSTEP_SYSTEM_LIBRARIES=@GNUSTEP_SYSTEM_LIBRARIES@

# This is where System documentation get installed. This is known
# not to contain any executable, so we keep it separate.
# Traditionally it is /usr/GNUstep/System/Library/Documentation.
GNUSTEP_SYSTEM_DOC=@GNUSTEP_SYSTEM_DOC@

# This is where System man pages get installed.
# Traditionally it is /usr/GNUstep/System/Library/Documentation/man.
GNUSTEP_SYSTEM_DOC_MAN=@GNUSTEP_SYSTEM_DOC_MAN@

# This is where System info pages get installed.
# Traditionally it is /usr/GNUstep/System/Library/Documentation/info.
GNUSTEP_SYSTEM_DOC_INFO=@GNUSTEP_SYSTEM_DOC_INFO@


GNUSTEP_NETWORK_APPS=@GNUSTEP_NETWORK_APPS@
GNUSTEP_NETWORK_ADMIN_APPS=@GNUSTEP_NETWORK_ADMIN_APPS@
GNUSTEP_NETWORK_WEB_APPS=@GNUSTEP_NETWORK_WEB_APPS@
GNUSTEP_NETWORK_TOOLS=@GNUSTEP_NETWORK_TOOLS@
GNUSTEP_NETWORK_ADMIN_TOOLS=@GNUSTEP_NETWORK_ADMIN_TOOLS@
GNUSTEP_NETWORK_LIBRARY=@GNUSTEP_NETWORK_LIBRARY@
GNUSTEP_NETWORK_HEADERS=@GNUSTEP_NETWORK_HEADERS@
GNUSTEP_NETWORK_LIBRARIES=@GNUSTEP_NETWORK_LIBRARIES@
GNUSTEP_NETWORK_DOC=@GNUSTEP_NETWORK_DOC@
GNUSTEP_NETWORK_DOC_MAN=@GNUSTEP_NETWORK_DOC_MAN@
GNUSTEP_NETWORK_DOC_INFO=@GNUSTEP_NETWORK_DOC_INFO@

GNUSTEP_LOCAL_APPS=@GNUSTEP_LOCAL_APPS@
GNUSTEP_LOCAL_ADMIN_APPS=@GNUSTEP_LOCAL_ADMIN_APPS@
GNUSTEP_LOCAL_WEB_APPS=@GNUSTEP_LOCAL_WEB_APPS@
GNUSTEP_LOCAL_TOOLS=@GNUSTEP_LOCAL_TOOLS@
GNUSTEP_LOCAL_ADMIN_TOOLS=@GNUSTEP_LOCAL_ADMIN_TOOLS@
GNUSTEP_LOCAL_LIBRARY=@GNUSTEP_LOCAL_LIBRARY@
GNUSTEP_LOCAL_HEADERS=@GNUSTEP_LOCAL_HEADERS@
GNUSTEP_LOCAL_LIBRARIES=@GNUSTEP_LOCAL_LIBRARIES@
GNUSTEP_LOCAL_DOC=@GNUSTEP_LOCAL_DOC@
GNUSTEP_LOCAL_DOC_MAN=@GNUSTEP_LOCAL_DOC_MAN@
GNUSTEP_LOCAL_DOC_INFO=@GNUSTEP_LOCAL_DOC_INFO@

# Important: settings in the User should normally be relative paths,
# and will be interpreted as relative to the user's directory. This
# allows each user to have their own domain to install things. You
# can set them to be absolute, mostly if you want to disable them
# by setting them equal to the ones in the Network domain.
GNUSTEP_USER_DIR_APPS=@GNUSTEP_USER_DIR_APPS@
GNUSTEP_USER_DIR_ADMIN_APPS=@GNUSTEP_USER_DIR_ADMIN_APPS@
GNUSTEP_USER_DIR_WEB_APPS=@GNUSTEP_USER_DIR_WEB_APPS@
GNUSTEP_USER_DIR_TOOLS=@GNUSTEP_USER_DIR_TOOLS@
GNUSTEP_USER_DIR_ADMIN_TOOLS=@GNUSTEP_USER_DIR_ADMIN_TOOLS@
GNUSTEP_USER_DIR_LIBRARY=@GNUSTEP_USER_DIR_LIBRARY@
GNUSTEP_USER_DIR_HEADERS=@GNUSTEP_USER_DIR_HEADERS@
GNUSTEP_USER_DIR_LIBRARIES=@GNUSTEP_USER_DIR_LIBRARIES@
GNUSTEP_USER_DIR_DOC=@GNUSTEP_USER_DIR_DOC@
GNUSTEP_USER_DIR_DOC_MAN=@GNUSTEP_USER_DIR_DOC_MAN@
GNUSTEP_USER_DIR_DOC_INFO=@GNUSTEP_USER_DIR_DOC_INFO@
3 changes: 2 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -5739,7 +5739,7 @@ done
#--------------------------------------------------------------------
# Produce the output files
#--------------------------------------------------------------------
ac_config_files="$ac_config_files config-noarch.make config.make openapp opentool executable.template GNUmakefile GNUstep.conf GNUstep.sh GNUstep.csh fixpath.sh gnustep-make.spec gnustep-config filesystem.make filesystem.sh filesystem.csh"
ac_config_files="$ac_config_files config-noarch.make config.make openapp opentool executable.template GNUmakefile GNUstep.conf GNUstep-strict-v2.conf GNUstep.sh GNUstep.csh fixpath.sh gnustep-make.spec gnustep-config filesystem.make filesystem.sh filesystem.csh"
ac_config_commands="$ac_config_commands default"
Expand Down Expand Up @@ -6327,6 +6327,7 @@ do
"executable.template") CONFIG_FILES="$CONFIG_FILES executable.template" ;;
"GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;;
"GNUstep.conf") CONFIG_FILES="$CONFIG_FILES GNUstep.conf" ;;
"GNUstep-strict-v2.conf") CONFIG_FILES="$CONFIG_FILES GNUstep-strict-v2.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" ;;
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1406,7 +1406,7 @@ AC_CHECK_PROGS(LATEX2HTML, latex2html)
# Produce the output files
#--------------------------------------------------------------------
AC_CONFIG_FILES([config-noarch.make config.make openapp opentool
executable.template GNUmakefile GNUstep.conf GNUstep.sh GNUstep.csh fixpath.sh
executable.template GNUmakefile GNUstep.conf GNUstep-strict-v2.conf GNUstep.sh GNUstep.csh fixpath.sh
gnustep-make.spec gnustep-config filesystem.make filesystem.sh filesystem.csh])
AC_CONFIG_COMMANDS([default],
[[chmod a+x openapp opentool fixpath.sh executable.template]],
Expand Down

0 comments on commit 6f044ae

Please sign in to comment.