fix #5251: login: set autocomplete on password and user

[pmg-gui.git] / Makefile

diff --git a/Makefile b/Makefile
index 382b18b03f36f70992142d66b28d914ee4bd69d2..1783e4f27181548cc874fa763e2159e0cb3f7d44 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,16 @@ include /usr/share/dpkg/pkg-info.mk
 
 PACKAGE=pmg-gui
 
-DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION)
+DSC=$(PACKAGE)_$(DEB_VERSION).dsc
+DEB=$(PACKAGE)_$(DEB_VERSION)_all.deb
 
 DESTDIR=
-DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
-WWWBASEDIR=${DESTDIR}/usr/share/javascript/${PACKAGE}
-WWWCSSDIR=${WWWBASEDIR}/css
-WWWIMAGESDIR=${WWWBASEDIR}/images
-WWWJSDIR=${WWWBASEDIR}/js
+DOCDIR=$(DESTDIR)/usr/share/doc/$(PACKAGE)
+WWWBASEDIR=$(DESTDIR)/usr/share/javascript/$(PACKAGE)
+WWWCSSDIR=$(WWWBASEDIR)/css
+WWWIMAGESDIR=$(WWWBASEDIR)/images
+WWWJSDIR=$(WWWBASEDIR)/js
 
 IMAGES=                                \
        images/logo-128.png             \
@@ -21,12 +23,27 @@ export DEB_VERSION_UPSTREAM_REVISION
 
 all:
 
-.PHONY: deb
-deb ${DEB}:
-       rm -rf build
-       rsync -a * build
-       cd build; dpkg-buildpackage -b -us -uc
-       lintian ${DEB}
+$(BUILDDIR):
+       rm -rf $@ $@.tmp
+       rsync -a * $@.tmp
+       mv $@.tmp $@
+
+
+.PHONY: dsc deb
+dsc: $(DSC)
+
+$(DSC): $(BUILDDIR)
+       cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
+       lintian $(DSC)
+
+sbuild: $(DSC)
+       sbuild $(DSC)
+
+deb: $(DEB)
+
+$(DEB): $(BUILDDIR)
+       cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
+       lintian $(DEB)
 
 .PHONY: js/pmgmanagerlib.js js/mobile/pmgmanagerlib-mobile.js
 js/pmgmanagerlib.js:
@@ -34,35 +51,36 @@ js/pmgmanagerlib.js:
 js/mobile/pmgmanagerlib-mobile.js:
        make -C js/mobile pmgmanagerlib-mobile.js
 
-install: pmg-index.html.tt pmg-mobile-index.html.tt js/pmgmanagerlib.js js/mobile/pmgmanagerlib-mobile.js ${IMAGES} ${CSSFILES}
-       install -d -m 755 ${WWWBASEDIR}
-       install -d -m 755 ${WWWCSSDIR}
-       install -d -m 755 ${WWWIMAGESDIR}
-       install -d -m 755 ${WWWJSDIR}
-       install -m 0644 pmg-index.html.tt ${WWWBASEDIR}
-       install -m 0644 pmg-mobile-index.html.tt ${WWWBASEDIR}
-       install -m 0644 js/pmgmanagerlib.js ${WWWJSDIR}
-       install -m 0644 js/mobile/pmgmanagerlib-mobile.js ${WWWJSDIR}
-       for f in ${IMAGES}; do install -m 0644 "$$f" ${WWWIMAGESDIR}; done
-       for f in ${CSSFILES}; do install -m 0644 "$$f" ${WWWCSSDIR}; done
+install: pmg-index.html.tt pmg-mobile-index.html.tt js/pmgmanagerlib.js js/mobile/pmgmanagerlib-mobile.js $(IMAGES) $(CSSFILES)
+       install -d -m 755 $(WWWBASEDIR)
+       install -d -m 755 $(WWWCSSDIR)
+       install -d -m 755 $(WWWIMAGESDIR)
+       install -d -m 755 $(WWWJSDIR)
+       install -m 0644 pmg-index.html.tt $(WWWBASEDIR)
+       install -m 0644 pmg-mobile-index.html.tt $(WWWBASEDIR)
+       install -m 0644 js/pmgmanagerlib.js $(WWWJSDIR)
+       install -m 0644 js/mobile/pmgmanagerlib-mobile.js $(WWWJSDIR)
+       for f in $(IMAGES); do install -m 0644 "$$f" $(WWWIMAGESDIR); done
+       for f in $(CSSFILES); do install -m 0644 "$$f" $(WWWCSSDIR); done
 
 .PHONY: upload
-upload: ${DEB}
-       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist stretch
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: $(DEB)
+       tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist $(UPLOAD_DIST)
 
 distclean: clean
        rm -f examples/simple-demo.pem
 
 .PHONY: lint
-lint:
-       $(MAKE) -C js/ lint
-       $(MAKE) -C js/mobile lint
+check:
+       $(MAKE) -C js/ check
+       $(MAKE) -C js/mobile check
 
 clean:
        make -C js clean
-       rm -rf ./build *.deb *.changes *.buildinfo
+       rm -rf $(PACKAGE)-[0-9]*/ *.dsc $(PACKAGE)*.tar.* *.deb *.changes *.buildinfo *.build
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall
-dinstall: ${DEB}
-       dpkg -i ${DEB}
+dinstall: $(DEB)
+       dpkg -i $(DEB)