folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do only string replacement (w/o -C) in %configure for now. 

CVS patchset: 2747
CVS date: 1999/01/22 22:20:44
This commit is contained in:
jbj 1999-01-22 22:20:44 +00:00
parent d635ea8d09
commit 6503ca3645
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
macros.in
View File

@ -113,8 +113,6 @@
# gotcha is that arguments, if present, should be on the same line as the # gotcha is that arguments, if present, should be on the same line as the
# %configure. # %configure.
# #
%configure(C:) \ %configure \
%{-C:pushd %{-C*}} \
%{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} \ %{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} \
CFLAGS="%{optflags}" ./configure %{_target} --prefix=%{_prefix} \ CFLAGS="%{optflags}" ./configure %{_target} --prefix=%{_prefix}
%{-C:popd}

2
popt/Makefile.am
View File

@ -13,7 +13,7 @@ noinst_INCLUDES = findme.h poptint.h
noinst_PROGRAMS = test1 noinst_PROGRAMS = test1
test1_SOURCES = test1.c test1_SOURCES = test1.c
test1_LDADD = -lpopt test1_LDADD = $(lib_LTLIBRARIES)
include_HEADERS = popt.h include_HEADERS = popt.h
lib_LTLIBRARIES = libpopt.la lib_LTLIBRARIES = libpopt.la

5
popt/Makefile.in
View File

@ -89,7 +89,7 @@ noinst_INCLUDES = findme.h poptint.h
noinst_PROGRAMS = test1 noinst_PROGRAMS = test1
test1_SOURCES = test1.c test1_SOURCES = test1.c
test1_LDADD = -lpopt test1_LDADD = $(lib_LTLIBRARIES)
include_HEADERS = popt.h include_HEADERS = popt.h
lib_LTLIBRARIES = libpopt.la lib_LTLIBRARIES = libpopt.la
@ -106,6 +106,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I. DEFS = @DEFS@ -I. -I$(srcdir) -I.
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
libpopt_la_LDFLAGS = libpopt_la_LDFLAGS =
libpopt_la_LIBADD = libpopt_la_LIBADD =
@ -114,7 +115,7 @@ popthelp.lo
PROGRAMS = $(noinst_PROGRAMS) PROGRAMS = $(noinst_PROGRAMS)
test1_OBJECTS = test1.o test1_OBJECTS = test1.o
test1_DEPENDENCIES = test1_DEPENDENCIES = libpopt.la
test1_LDFLAGS = test1_LDFLAGS =
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

6
tests/macros.in
View File

@ -113,8 +113,6 @@
# gotcha is that arguments, if present, should be on the same line as the # gotcha is that arguments, if present, should be on the same line as the
# %configure. # %configure.
# #
%configure(C:) \ %configure \
%{-C:pushd %{-C*}} \
%{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} \ %{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} \
CFLAGS="%{optflags}" ./configure %{_build} --prefix=%{_prefix} \ CFLAGS="%{optflags}" ./configure %{_target} --prefix=%{_prefix}
%{-C:popd}