X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl-module%2Fautomake.mk;h=d9e0882006a07f8a7f62b16be976a2e4fd6a7b81;hb=2433a0bf2a07042d7a5b70c36196c498b0393f7f;hp=4f45a655955c2fc5ed59471d716a959bbef1232f;hpb=9009906e3a6dd95f35b97331abf68491f27bf148;p=pspp

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 4f45a65595..d9e0882006 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -1,19 +1,19 @@
 # PSPP - a program for statistical analysis.
 # Copyright (C) 2017 Free Software Foundation, Inc.
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
+#
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 # PSPP
@@ -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
@@ -68,6 +71,7 @@ perl_module_tarball: $(module_sources) src/libpspp-core.la
 		      echo "  GEN      $$destdir/$$f"; \
 		 fi; \
 		 cp $(top_srcdir)/$$f $$destdir ; \
+		 chmod u+w $$destdir/`basename $$f`; \
 	  fi ; \
 	 done \
 	fi
@@ -79,12 +83,12 @@ 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 \
 	perl-module/pspp-module-config \
 	perl-module/const-c.inc \
-	perl-module/const-xs.inc 
+	perl-module/const-xs.inc
 
 EXTRA_DIST +=  $(module_sources)