diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2014-07-31 17:32:07 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2014-07-31 17:32:07 +0800 |
| commit | cd39b73ef1a5905bb653b29cb2303ae9f053eff5 (patch) | |
| tree | 674377f1470ff87f421e6da61940c1e7ba6bbb4d | |
| parent | 4edb8f91084c0d373808b2cd399d0b747eb964ca (diff) | |
| download | wspkg-cd39b73ef1a5905bb653b29cb2303ae9f053eff5.tar wspkg-cd39b73ef1a5905bb653b29cb2303ae9f053eff5.tar.gz wspkg-cd39b73ef1a5905bb653b29cb2303ae9f053eff5.tar.bz2 wspkg-cd39b73ef1a5905bb653b29cb2303ae9f053eff5.tar.lz wspkg-cd39b73ef1a5905bb653b29cb2303ae9f053eff5.tar.xz wspkg-cd39b73ef1a5905bb653b29cb2303ae9f053eff5.tar.zst wspkg-cd39b73ef1a5905bb653b29cb2303ae9f053eff5.zip | |
debian: 修正當 DEBIAN_OUT_REPO 不是絕對路徑時可能造成的問題
| -rw-r--r-- | debian/debian.mk | 12 | ||||
| -rw-r--r-- | wspkg-mk/silent.mk | 14 |
2 files changed, 9 insertions, 17 deletions
diff --git a/debian/debian.mk b/debian/debian.mk index 6b8985d..698097b 100644 --- a/debian/debian.mk +++ b/debian/debian.mk @@ -16,14 +16,14 @@ $(DEBIAN_OUT_CONTROL): $(control_deps) # debian.control -> 217-meta.deb $(DEBIAN_OUT_PKG): $(DEBIAN_OUT_CONTROL) - -@mkdir -p $(DEBIAN_OUT_PKGDIR)/DEBIAN + $(AT_MKDIR)mkdir -p $(DEBIAN_OUT_PKGDIR)/DEBIAN $(AT_COPY)cp -pf $(DEBIAN_OUT_CONTROL) \ $(DEBIAN_OUT_PKGDIR)/DEBIAN/control - $(AT_PKG)dpkg-deb --build \ + $(AT_GEN)dpkg-deb --build \ $(DEBIAN_OUT_PKGDIR) $(DEBIAN_OUT_PKG) debian-install: $(DEBIAN_OUT_PKG) - -@mkdir -p $(DEBIAN_OUT_REPO) - $(AT_INSTALL)cp -pf $(DEBIAN_OUT_PKG) $(DEBIAN_OUT_REPO) - $(AT_SCAN)cd $(DEBIAN_OUT_REPO) && dpkg-scanpackages . | \ - gzip -9 > $(DEBIAN_OUT_REPO)/Packages.gz + $(AT_MKDIR)mkdir -p $(DEBIAN_OUT_REPO) + $(AT_COPY)cp -pf $(DEBIAN_OUT_PKG) $(DEBIAN_OUT_REPO) + $(AT_GEN)cd $(DEBIAN_OUT_REPO) && dpkg-scanpackages . > Packages + $(AT_GEN)gzip -9f $(DEBIAN_OUT_REPO)/Packages diff --git a/wspkg-mk/silent.mk b/wspkg-mk/silent.mk index 3ba4730..6f504c8 100644 --- a/wspkg-mk/silent.mk +++ b/wspkg-mk/silent.mk @@ -20,18 +20,10 @@ AT_GEN=$(AT_GEN_$(V)) AT_GEN_0=@echo " GEN "$@; AT_GEN_1= -AT_PKG=$(AT_PKG_$(V)) -AT_PKG_0=@echo " PKG "$@; -AT_PKG_1= - AT_COPY=$(AT_COPY_$(V)) AT_COPY_0=@echo " COPY "$@; AT_COPY_1= -AT_SCAN=$(AT_SCAN_$(V)) -AT_SCAN_0=@echo " SCAN "$@; -AT_SCAN_1= - -AT_INSTALL=$(AT_INSTALL_$(V)) -AT_INSTALL_0=@echo " INSTALL "$@; -AT_INSTALL_1= +AT_MKDIR=$(AT_MKDIR_$(V)) +AT_MKDIR_0=@echo " MKDIR "$@; +AT_MKDIR_1= |