Little fix

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@8675 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2001-01-18 14:15:30 +00:00
parent dee5b3058e
commit e3590354c3
3 changed files with 12 additions and 0 deletions

View file

@ -1,3 +1,9 @@
Thu Jan 18 12:15:11 2001 Nicola Pero <nicola@brainstorm.co.uk>
* rpm.make: Build the file-list only at top level.
* gnustep-make.spec.in: Do a make distclean before running
configure.
2001-01-17 Adam Fedor <fedor@gnu.org> 2001-01-17 Adam Fedor <fedor@gnu.org>
* library.make: Revert last change, add LIBRARY_INSTALL_DIR * library.make: Revert last change, add LIBRARY_INSTALL_DIR

View file

@ -46,6 +46,7 @@ for library combo %{gs_libcombo}.
%setup -n %{gs_name}-%{gs_version} %setup -n %{gs_name}-%{gs_version}
%build %build
make distclean
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{gs_prefix} --with-library-combo=%{gs_libcombo} CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{gs_prefix} --with-library-combo=%{gs_libcombo}
make make

View file

@ -201,6 +201,9 @@ RPM_MAKE_LOADED=yes
ifeq ($(filelist),yes) ifeq ($(filelist),yes)
# Build the file-list only at top level
ifeq ($(MAKELEVEL),0)
# Determine which file list to build # Determine which file list to build
ifeq ($(debug),yes) ifeq ($(debug),yes)
FILE_LIST = $(shell pwd)/file-list-debug FILE_LIST = $(shell pwd)/file-list-debug
@ -231,6 +234,8 @@ ifeq ($(filelist),yes)
sed -e "s|$(INSTALL_ROOT_DIR)||" $(FILE_LIST) > file-list.tmp sed -e "s|$(INSTALL_ROOT_DIR)||" $(FILE_LIST) > file-list.tmp
mv file-list.tmp $(FILE_LIST) mv file-list.tmp $(FILE_LIST)
endif # MAKELEVEL
endif # filelist == yes endif # filelist == yes