change makefile formatting

diff --git a/Makefile b/Makefile
index b04dddf0e0fd91d69bf25974f1061cfebf1c9921..e22799fa8936d03cbc59bf937a59238a5d87a38b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ VERSION = $(VERSIONNR)$(EXTRA)
 PACKAGENAME = scantopdf-$(VERSION)-$(BUILDVERSION)-$(ARCHITECTURE)
 
 BUILDDIR = build
-PACKAGEDIR = build/$(PACKAGENAME)
+PACKAGEDIR = $(BUILDDIR)/$(PACKAGENAME)
 SRCDIR = src
 BINDIR = usr/local/bin
 SHAREDIR = usr/local/share
@@ -23,7 +23,7 @@ build: $(PACKAGEDIR)/$(BINDIR)/scantopdf \
        $(PACKAGEDIR)/$(BINDIR)/scantopdfgray \
        $(PACKAGEDIR)/$(BINDIR)/scantopdfbw
 
-package: build $(BUILDDIR)/$(PACKAGENAME).deb
+package: $(BUILDDIR)/$(PACKAGENAME).deb
 
 clean:
        rm -rf $(BUILDDIR)
@@ -31,8 +31,9 @@ clean:
 ################################################################################
 
 $(PACKAGEDIR)/$(BINDIR)/scantopdf: \
-       $(SRCDIR)/scantopdf \
-       $(SRCDIR)/scanbasic.sh
+       $(SRCDIR)/scanbasic.sh \
+       $(SRCDIR)/scantopdf
+
        mkdir -p $(@D)
        cat $(SRCDIR)/scantopdf \
                        | sed "/@scanbasic.sh@/r $(SRCDIR)/scanbasic.sh" \
@@ -42,8 +43,9 @@ $(PACKAGEDIR)/$(BINDIR)/scantopdf: \
        chmod 755 $(PACKAGEDIR)/$(BINDIR)/scantopdf
 
 $(PACKAGEDIR)/$(BINDIR)/scantopdfgray: \
-       $(SRCDIR)/scantopdfgray \
-       $(SRCDIR)/scanbasic.sh
+       $(SRCDIR)/scanbasic.sh \
+       $(SRCDIR)/scantopdfgray
+
        mkdir -p $(@D)
        cat $(SRCDIR)/scantopdfgray \
                        | sed "/@scanbasic.sh@/r $(SRCDIR)/scanbasic.sh" \
@@ -53,10 +55,11 @@ $(PACKAGEDIR)/$(BINDIR)/scantopdfgray: \
        chmod 755 $(PACKAGEDIR)/$(BINDIR)/scantopdfgray
 
 $(PACKAGEDIR)/$(BINDIR)/scantopdfbw: \
-       $(SRCDIR)/scantopdfbw \
-       $(SRCDIR)/scanbasic.sh
+       $(SRCDIR)/scanbasic.sh \
+       $(SRCDIR)/scantopdfbw
+
        mkdir -p $(@D)
-       cat src/scantopdfbw \
+       cat $(SRCDIR)/scantopdfbw \
                        | sed "/@scanbasic.sh@/r $(SRCDIR)/scanbasic.sh" \
                        | sed "/@scanbasic.sh@/d" \
                        | sed "s/@VERSION@/$(VERSION)/" \
@@ -67,6 +70,7 @@ $(PACKAGEDIR)/$(BINDIR)/scantopdfbw: \
 
 $(PACKAGEDIR)/$(SHAREDIR)/scantopdf/cutpage.html: \
        $(SRCDIR)/cutpage.html
+
        mkdir -p $(@D)
        cp $(SRCDIR)/cutpage.html $(PACKAGEDIR)/$(SHAREDIR)/scantopdf/cutpage.html
 
@@ -74,6 +78,7 @@ $(PACKAGEDIR)/$(SHAREDIR)/scantopdf/cutpage.html: \
 
 $(PACKAGEDIR)/DEBIAN/control: \
        $(SRCDIR)/control
+
        mkdir -p $(@D)
        cat $(SRCDIR)/control   \
                | sed "s/@VERSION@/$(VERSION)/" \
@@ -85,5 +90,6 @@ $(BUILDDIR)/$(PACKAGENAME).deb: \
        $(PACKAGEDIR)/$(BINDIR)/scantopdfbw \
        $(PACKAGEDIR)/$(SHAREDIR)/scantopdf/cutpage.html \
        $(PACKAGEDIR)/DEBIAN/control
+
        mkdir -p $(@D)
        cd build && dpkg-deb --build --root-owner-group $(PACKAGENAME)
\ No newline at end of file