Build with -e
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 23 Feb 2016 13:32:13 +0000 (14:32 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 23 Feb 2016 13:32:13 +0000 (14:32 +0100)
* src/Makefile.am: Fix errors.
* src/gpg4win.mk.in: Inject -e through variable setters.

--
Undetected build errors can lead to horrible horrible follow up
errors especially if something like mkdir / change dir fails
and commands get executed in wrong directories.

src/Makefile.am
src/gpg4win.mk.in

index 2a16757..d222a04 100644 (file)
@@ -185,7 +185,7 @@ endef
 
 # Build the reference manual.
 define gpg4win_pkg_gpgol_post_install
 
 # Build the reference manual.
 define gpg4win_pkg_gpgol_post_install
-( cd $$$${pkgndir}/doc; make pdf )
+( cd $$$${pkgbdir}/doc; make pdf )
 endef
 
 # We would like to use --with-libiconv-prefix and
 endef
 
 # We would like to use --with-libiconv-prefix and
@@ -454,11 +454,6 @@ define gpg4win_pkg_pango_post_install
  perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
 endef
 
  perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
 endef
 
-define gpg4win_pkg_gtk__post_install
- (cd $$$${pkgidir_dev};                                                        \
- perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
-endef
-
 define gpg4win_pkg_libpng_post_install
  (cd $$$${pkgidir};                                                    \
  perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
 define gpg4win_pkg_libpng_post_install
  (cd $$$${pkgidir};                                                    \
  perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
index 3b9eb82..41e7cd5 100644 (file)
@@ -60,6 +60,7 @@ endef
 
 # Set a couple of common variables.
 define SETVARS
 
 # Set a couple of common variables.
 define SETVARS
+       set -e; \
        pkg="$(call GETVAR,gpg4win_pkg_$(1))";                          \
        pkg_version="$(1)-$(call GETVAR,gpg4win_pkg_$(1)_version)";     \
        pkgsdir="$(bdir)/$$$${pkg_version}";                            \
        pkg="$(call GETVAR,gpg4win_pkg_$(1))";                          \
        pkg_version="$(1)-$(call GETVAR,gpg4win_pkg_$(1)_version)";     \
        pkgsdir="$(bdir)/$$$${pkg_version}";                            \
@@ -86,6 +87,7 @@ endef
 
 # Set variables for building in an additional architecture
 define SETVARS_EX
 
 # Set variables for building in an additional architecture
 define SETVARS_EX
+       set -e; \
        pkg="$(call GETVAR,gpg4win_pkg_$(1))";                              \
        pkg_version="$(1)-$(call GETVAR,gpg4win_pkg_$(1)_version)";         \
        pkgsdir="$(bdir)/$$$${pkg_version}";                                \
        pkg="$(call GETVAR,gpg4win_pkg_$(1))";                              \
        pkg_version="$(1)-$(call GETVAR,gpg4win_pkg_$(1)_version)";         \
        pkgsdir="$(bdir)/$$$${pkg_version}";                                \