Permalink
Browse files

correct deb rule to refer to package name properly

  • Loading branch information...
superm1 committed Jul 6, 2017
1 parent 053cc1b commit 85f3ba3d8aa47b75d71b98abaab196fc4a8e2e06
Showing with 8 additions and 8 deletions.
  1. +8 −8 Makefile-std
View
@@ -109,20 +109,20 @@ changelog: $(CHANGELOG)
$(CHANGELOG): version.mk
cd pkg/ && fakeroot debchange -v $(PACKAGE_VERSION)-$(DEB_RELEASE) $(CHANGELOG_TEXT)
TARBALL=$(PACKAGE_STRING).tar.gz
TARBALL=$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.xz
debmagic:
[ -n "$$DEB_TMP_BUILDDIR" ] || (echo "Must set DEB_TMP_BUILDDIR=/tmp/... for deb and sdeb targets"; exit 1)
[ -n "$$DIST" ] || (echo "Must set DIST={gutsy,hardy,sid,...} for deb and sdeb targets"; exit 1)
[ -n "$$DIST" ] || echo "Remember to set DISTTAG='~gutsy1' for deb and sdeb targets for backports"
mkdir -p dist/$(DIST)
cp $(TARBALL) $(DEB_TMP_BUILDDIR)/$(PACKAGE_NAME)_$(PACKAGE_VERSION).orig.tar.gz
tar -C $(DEB_TMP_BUILDDIR) -xzf $(TARBALL)
cp -ar pkg/debian $(DEB_TMP_BUILDDIR)/$(PACKAGE_STRING)/debian
chmod +x $(DEB_TMP_BUILDDIR)/$(PACKAGE_STRING)/debian/rules
sed -e "s/#DISTTAG#/$(DISTTAG)/g" -e "s/#DIST#/$(DIST)/g" $(DEB_TMP_BUILDDIR)/$(PACKAGE_STRING)/debian/changelog.in > $(DEB_TMP_BUILDDIR)/$(PACKAGE_STRING)/debian/changelog
rm $(DEB_TMP_BUILDDIR)/$(PACKAGE_STRING)/debian/changelog.in
cd $(DEB_TMP_BUILDDIR)/$(PACKAGE_STRING) ; \
cp $(TARBALL) $(DEB_TMP_BUILDDIR)/$(PACKAGE_NAME)_$(PACKAGE_VERSION).orig.tar.xz
tar -C $(DEB_TMP_BUILDDIR) -xf $(TARBALL)
cp -ar pkg/debian $(DEB_TMP_BUILDDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian
chmod +x $(DEB_TMP_BUILDDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian/rules
sed -e "s/#DISTTAG#/$(DISTTAG)/g" -e "s/#DIST#/$(DIST)/g" $(DEB_TMP_BUILDDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian/changelog.in > $(DEB_TMP_BUILDDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian/changelog
rm $(DEB_TMP_BUILDDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/debian/changelog.in
cd $(DEB_TMP_BUILDDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) ; \
./configure ; \
pdebuild --use-pdebuild-internal --buildresult $(TOPDIR)/dist/$(DIST) ; \
dpkg-buildpackage -D -S -sa -rfakeroot ; \

0 comments on commit 85f3ba3

Please sign in to comment.