Package: pam
Severity: normal
Tags: patch

Hi,

I noticed an error in the doc/Makefile (ifeq indented) causing a shell error
and the main Makefile does not abort.

The attached patch only fixes the main makefile and the actual error in
doc/Makefile. Other Makefiles (including doc/Makefile) still have shell
commands that won't abort on error.

MfG
        Goswin

-- System Information:
Debian Release: 3.1
Architecture: i386 (i686)
Kernel: Linux 2.4.27-rc5+skas3+acl
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
diff -Nru /tmp/irezbwbIni/pam-0.76/Linux-PAM/Makefile 
/tmp/spYVKyIo2M/pam-0.76/Linux-PAM/Makefile
--- /tmp/irezbwbIni/pam-0.76/Linux-PAM/Makefile 2005-09-13 10:33:32.000000000 
+0000
+++ /tmp/spYVKyIo2M/pam-0.76/Linux-PAM/Makefile 2005-09-13 10:33:32.000000000 
+0000
@@ -62,21 +62,21 @@
 install: _pam_aconf.h prep
        $(MKDIR) $(FAKEROOT)$(INCLUDED)
        $(INSTALL) -m 444 security/_pam_aconf.h $(FAKEROOT)$(INCLUDED)
-       for x in $(THINGSTOMAKE) ; do $(MAKE) -C $$x install ; done
+       set -e; for x in $(THINGSTOMAKE) ; do $(MAKE) -C $$x install ; done
 
 remove:
        rm -f $(FAKEROOT)$(INCLUDED)/_pam_aconf.h
-       for x in $(THINGSTOMAKE) ; do $(MAKE) -C $$x remove ; done
+       set -e; for x in $(THINGSTOMAKE) ; do $(MAKE) -C $$x remove ; done
 
 release:
        @if [ ! -f Make.Rules ]; then echo $(MAKE) Make.Rules first ;exit 1 ;fi
        @if [ ! -L ../$(DISTNAME)-$(MAJOR_REL).$(MINOR_REL) ]; then \
-          echo generating ../$(DISTNAME)-$(MAJOR_REL).$(MINOR_REL) link ; \
-          ln -sf $(DISTNAME) ../$(DISTNAME)-$(MAJOR_REL).$(MINOR_REL) ; \
+          echo generating ../$(DISTNAME)-$(MAJOR_REL).$(MINOR_REL) link && \
+          ln -sf $(DISTNAME) ../$(DISTNAME)-$(MAJOR_REL).$(MINOR_REL) && \
           echo to ../$(DISTNAME) . ; fi
        @diff ../$(DISTNAME)-$(MAJOR_REL).$(MINOR_REL)/Make.Rules Make.Rules
        $(MAKE) distclean
-       cd .. ; tar zvfc $(DISTNAME)-$(MAJOR_REL).$(MINOR_REL).tar.gz \
+       cd .. && tar zvfc $(DISTNAME)-$(MAJOR_REL).$(MINOR_REL).tar.gz \
                --exclude CVS --exclude .cvsignore --exclude '.#*' \
                $(DISTNAME)-$(MAJOR_REL).$(MINOR_REL)/*
 
diff -Nru /tmp/irezbwbIni/pam-0.76/Linux-PAM/doc/Makefile 
/tmp/spYVKyIo2M/pam-0.76/Linux-PAM/doc/Makefile
--- /tmp/irezbwbIni/pam-0.76/Linux-PAM/doc/Makefile     2005-09-13 
10:33:32.000000000 +0000
+++ /tmp/spYVKyIo2M/pam-0.76/Linux-PAM/doc/Makefile     2005-09-13 
10:33:32.000000000 +0000
@@ -125,12 +125,12 @@
        for file in ps/*.ps; do \
          install -m 644 $$file $(FAKEROOT)$(DOCDIR)/ps  ; \
        done
-       ifeq ($(HAVE_PS2PDF),yes)
+ifeq ($(HAVE_PS2PDF),yes)
                mkdir -p $(FAKEROOT)$(DOCDIR)/pdf
                for file in pdf/*.pdf; do \
                  install -m 644 $$file $(FAKEROOT)$(DOCDIR)/pdf  ; \
                done
-       endif
+endif
 endif
 ifeq ($(HAVE_SGML2HTML),yes)
        mkdir -p $(FAKEROOT)$(DOCDIR)/html

Reply via email to