X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl-module%2Fautomake.mk;h=d9e0882006a07f8a7f62b16be976a2e4fd6a7b81;hb=18022dbd73e38274f5293237516ff7e47fdc107b;hp=ea1a47c7c2e838504c2d42e820d2cc9867a68fb0;hpb=facb4a1ad3c9e8b2cdf55824680eed2afb91aebe;p=pspp

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index ea1a47c7c2..d9e0882006 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -36,14 +36,17 @@ PERL_MAKEFLAGS = $(AM_MAKEFLAGS) LD_RUN_PATH=$(pkglibdir)
 perl-module/pspp-module-config: Makefile
 	$(AM_V_GEN)(echo '%Locations = (';\
 	 printf "  SourceDir => '";\
-	 (cd $(top_srcdir) && echo `pwd`\', ) ;\
+	 (cd "$(top_srcdir)" && echo `pwd`\', ) ;\
 	 printf "  BuildDir => '";\
-	 (cd $(top_builddir) && echo `pwd`\' );\
-	 echo ');') > $(top_builddir)/perl-module/pspp-module-config
+	 (cd "$(top_builddir)" && echo `pwd`\' );\
+	 echo ');') > "$(top_builddir)/perl-module/pspp-module-config"
 
-perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config $(module_sources)
+perl-module/Makefile: perl-module/MakefileX
+	$(SED)  -e "/^INC/s/\([^=]\)  *-I/\1\" -I/g" -e "/^INC/s/  *-I */ -I\"/g" -e "/^INC/s/ *$$/\"/" -e "/^MYEXTLIB/s/\([^=]\) \([^=]\)/\1\\\\ \2/g" $< > $@
+
+perl-module/MakefileX: perl-module/Makefile.PL perl-module/pspp-module-config $(module_sources)
 	$(AM_V_GEN)cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix) \
-                                                         OPTIMIZE="$(CFLAGS) $(CPPFLAGS)" \
+                                                         OPTIMIZE="$(CFLAGS) $(CPPFLAGS) -Wno-error" \
                                                          LD="`$(PERL) -e 'use Config::Perl::V;print Config::Perl::V::myconfig()->{config}{ld};'` $(LDFLAGS)"
 
 perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) perl-module/Makefile
@@ -80,7 +83,7 @@ perl_module_clean:
 	if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
 	  rm -f $(module_sources) ; \
 	fi
-	rm -f perl-module/Makefile.old
+	rm -f perl-module/Makefile.old perl-module/MakefileX perl-module/MakefileX.old perl-module/Makefile
 
 CLEANFILES += \
         perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz \