Dr. Werner Fink 2015-03-03 13:13:58 +00:00 committed by Git OBS Bridge
parent f4d5bfcb41
commit cac6c3ada4
2 changed files with 20 additions and 11 deletions

View File

@ -1,10 +1,10 @@
--- ---
Makefile.in | 2 -- Makefile.in | 2 --
contrib/Makefile.in | 12 ------------ contrib/Makefile.in | 22 ----------------------
2 files changed, 14 deletions(-) 2 files changed, 24 deletions(-)
--- Makefile.in --- Makefile.in
+++ Makefile.in 2015-03-03 12:08:59.329518342 +0000 +++ Makefile.in 2015-03-03 12:08:59.000000000 +0000
@@ -286,8 +286,6 @@ all: config.h @@ -286,8 +286,6 @@ all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -15,8 +15,8 @@
@for dep in $?; do \ @for dep in $?; do \
case '$(am__configure_deps)' in \ case '$(am__configure_deps)' in \
--- contrib/Makefile.in --- contrib/Makefile.in
+++ contrib/Makefile.in 2015-03-03 12:08:38.637518148 +0000 +++ contrib/Makefile.in 2015-03-03 13:03:12.306018770 +0000
@@ -320,18 +320,6 @@ all: all-recursive @@ -320,28 +320,6 @@ all: all-recursive
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .m4 .in .c .l .lo .o .obj .SUFFIXES: .m4 .in .c .l .lo .o .obj
@ -32,6 +32,16 @@
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \
- cd $(top_srcdir) && \ - cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu contrib/Makefile - $(AUTOMAKE) --gnu contrib/Makefile
.PRECIOUS: Makefile -.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ - @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

View File

@ -128,11 +128,10 @@ find -name Makefile.in | xargs touch
for m4 in *.m4; do for m4 in *.m4; do
in=${m4%.*}.in in=${m4%.*}.in
rm -f ${in} ${m4%.*} rm -f ${in} ${m4%.*}
/usr/bin/m4 ${m4} con="$con ${in##*/}"
sed -e 's/@BKL@/[/g;s/@BKR@/]/g;s/@DLR@/$/g;s/@PND@/#/g'> ${in}-tmp
mv ${in}-tmp ${in}
done done
popd popd
make %{?_smp_mflags} -C contrib/ ${con} LDFLAGS="-pie"
sh ./config.status sh ./config.status
make %{?_smp_mflags} PSFONT_PATH=%{_datadir}/ghostscript/fonts LDFLAGS="-pie" MAKEINFO='makeinfo --force' make %{?_smp_mflags} PSFONT_PATH=%{_datadir}/ghostscript/fonts LDFLAGS="-pie" MAKEINFO='makeinfo --force'
pushd doc pushd doc