aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--Makefile.PL2
-rw-r--r--rpmtools.spec12
3 files changed, 10 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index f2b4327..8137ef8 100644
--- a/Makefile
+++ b/Makefile
@@ -10,14 +10,11 @@ CFLAGS = -Wall -g
LIBRPM = -lrpm -ldb1 -lz -lbz2 -I/usr/include/rpm -lpopt
all: $(ALL)
- perl Makefile.PL
- $(MAKE) -f Makefile_core $@
install: $(ALL)
install -d $(PREFIX)/usr/bin
install -s $(ALL) $(PREFIX)/usr/bin
install genhdlist_cz2 genhdlists genbasefiles genfilelist packdrake $(PREFIX)/usr/bin
- $(MAKE) -f Makefile_core PREFIX=$(PREFIX)/usr $@
$(FROMCC): %: %.cc
$(CXX) $(CFLAGS) $< $(LIBRPM) -o $@
diff --git a/Makefile.PL b/Makefile.PL
index 9e62f5e..0848489 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,7 +6,7 @@ my $libs = ' -lrpm -ldb1 -lz';
WriteMakefile(
'NAME' => 'rpmtools',
- 'OPTIMIZE' => '-O3 -fomit-frame-pointer -fno-exceptions -fno-rtti -pipe -s -mpentium -mcpu=pentium -march=pentium -ffast-math -fexpensive-optimizations',
+ 'OPTIMIZE' => '-O3 -fomit-frame-pointer -fno-exceptions -fno-rtti -pipe -s -ffast-math -fexpensive-optimizations',
'MAKEFILE' => 'Makefile_core',
'OBJECT' => 'rpmtools.o',
'VERSION_FROM' => 'rpmtools.pm',
diff --git a/rpmtools.spec b/rpmtools.spec
index 5857f03..9d6653c 100644
--- a/rpmtools.spec
+++ b/rpmtools.spec
@@ -1,5 +1,5 @@
%define name rpmtools
-%define release 2mdk
+%define release 3mdk
# do not modify here, see Makefile in the CVS
%define version 1.2
@@ -40,11 +40,14 @@ rpmtools package.
%setup
%build
-make CFLAGS="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL
+%{make} -f Makefile_core OPTIMIZE="$RPM_OPT_FLAGS"
+%{make} CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT
+%{make} install PREFIX=$RPM_BUILD_ROOT
+%{make} -f Makefile_core install PREFIX=$RPM_BUILD_ROOT%{_prefix}
# compability tools, based upon parsehdlist ones.
ln -s parsehdlist $RPM_BUILD_ROOT%{_bindir}/hdlist2names
@@ -96,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 28 2000 François Pons <fpons@mandrakesoft.com> 1.2-3mdk
+- fixed ugly arch specific optimization in Makefile.PL.
+
* Fri Aug 25 2000 François Pons <fpons@mandrakesoft.com> 1.2-2mdk
- added rpmtools perl module.
- added genbasefiles to build compss, depslist.ordered and provides files