gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add option to disable moving obsolete dirs

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@16932 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2003-06-17 03:50:41 +00:00
parent 4142c06e42
commit b7ef8fef5f
4 changed files with 53 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2003-06-16 Adam Fedor <fedor@gnu.org>
* configure.ac: Add option to disable moving obsolete dirs
* GNUmakefile.in: Update for change.
2003-06-15 Adam Fedor <fedor@gnu.org>
* target.make (openbsd/SHARED_LIB_LINK_CMD): Use gcc to link

8
GNUmakefile.in
View file

@ -117,10 +117,12 @@ else
EC = @
endif
install: all
move_obsolete:
$(EC)(echo "Moving paths from old heirarchy: "; \
$(srcdir)/move_obsolete_paths.sh $(GNUSTEP_SYSTEM_ROOT) $(GNUSTEP_LOCAL_ROOT) $(GNUSTEP_USER_ROOT); \
echo "Creating system domain: $(GNUSTEP_SYSTEM_ROOT)"; \
$(srcdir)/move_obsolete_paths.sh $(GNUSTEP_SYSTEM_ROOT) $(GNUSTEP_LOCAL_ROOT) $(GNUSTEP_USER_ROOT))
install: all @GNUSTEP_MOVE_OBSOLETE@
$(EC)(echo "Creating system domain: $(GNUSTEP_SYSTEM_ROOT)"; \
$(srcdir)/create_domain_dir_tree.sh $(GNUSTEP_SYSTEM_ROOT); \
echo "Creating local and network dirs: $(GNUSTEP_LOCAL_ROOT), $(GNUSTEP_NETWORK_ROOT)"; \
$(srcdir)/mkinstalldirs $(GNUSTEP_LOCAL_ROOT) $(GNUSTEP_NETWORK_ROOT);\

25
configure vendored
View file

@ -841,6 +841,7 @@ Optional Features:
--disable-backend-bundle Compile gui backend as a library
--enable-import Don't warn about usage of deprecated import directive
--disable-move-obsolete Disable moving obsolete dir structure
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -4180,6 +4181,29 @@ fi
CPPFLAGS="$user_CPPFLAGS"
#--------------------------------------------------------------------
# Disable updating the obsolete directory structure
#--------------------------------------------------------------------
gs_move_obsolete=yes
# Check whether --enable-move-obsolete or --disable-move-obsolete was given.
if test "${enable_move_obsolete+set}" = set; then
enableval="$enable_move_obsolete"
gs_move_obsolete=$enableval
else
gs_move_obsolete=yes
fi;
if test "$gs_move_obsolete" = "yes"; then
GNUSTEP_MOVE_OBSOLETE=move_obsolete;
{ echo "$as_me:$LINENO: *** WARNING any old GNUstep directories installed before gnustep-make 1.7.0 will be moved to the new locations unless disabled in configure" >&5
echo "$as_me: *** WARNING any old GNUstep directories installed before gnustep-make 1.7.0 will be moved to the new locations unless disabled in configure" >&6;}
else
GNUSTEP_MOVE_OBSOLETE=
{ echo "$as_me:$LINENO: Old GNUstep directories will not be moved" >&5
echo "$as_me: Old GNUstep directories will not be moved" >&6;}
fi
#--------------------------------------------------------------------
# Record the version
#--------------------------------------------------------------------
@ -4839,6 +4863,7 @@ s,@ac_cv_objc_threaded@,$ac_cv_objc_threaded,;t t
s,@AUTO_DEPENDENCIES@,$AUTO_DEPENDENCIES,;t t
s,@OBJC_NO_IMPORT_FLAGS@,$OBJC_NO_IMPORT_FLAGS,;t t
s,@INCLUDE_FLAGS@,$INCLUDE_FLAGS,;t t
s,@GNUSTEP_MOVE_OBSOLETE@,$GNUSTEP_MOVE_OBSOLETE,;t t
s,@GNUSTEP_MAKE_VERSION@,$GNUSTEP_MAKE_VERSION,;t t
s,@GNUSTEP_MAKE_MAJOR_VERSION@,$GNUSTEP_MAKE_MAJOR_VERSION,;t t
s,@GNUSTEP_MAKE_MINOR_VERSION@,$GNUSTEP_MAKE_MINOR_VERSION,;t t

18
configure.ac
View file

@ -507,6 +507,24 @@ AC_SUBST(OBJC_NO_IMPORT_FLAGS)
CPPFLAGS="$user_CPPFLAGS"
AC_SUBST(INCLUDE_FLAGS)
#--------------------------------------------------------------------
# Disable updating the obsolete directory structure
#--------------------------------------------------------------------
gs_move_obsolete=yes
AC_ARG_ENABLE(move-obsolete,
[--disable-move-obsolete Disable moving obsolete dir structure],
gs_move_obsolete=$enableval,
gs_move_obsolete=yes)
if test "$gs_move_obsolete" = "yes"; then
GNUSTEP_MOVE_OBSOLETE=move_obsolete;
AC_MSG_NOTICE(*** WARNING any old GNUstep directories installed before gnustep-make 1.7.0 will be moved to the new locations unless disabled in configure)
else
GNUSTEP_MOVE_OBSOLETE=
AC_MSG_NOTICE(Old GNUstep directories will not be moved)
fi
AC_SUBST(GNUSTEP_MOVE_OBSOLETE)
#--------------------------------------------------------------------
# Record the version
#--------------------------------------------------------------------