From af097e64fa01ae71ef67ef12b76521430dcd63e7 Mon Sep 17 00:00:00 2001 From: Hubert Plociniczak Date: Thu, 4 Sep 2008 15:05:21 +0100 Subject: Reverted changes that accidentally got committed --- Makefile | 8 ++++---- packaging/debs/Debian/Makefile | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 4bbf227a..2ed64aa5 100644 --- a/Makefile +++ b/Makefile @@ -99,11 +99,11 @@ generic_stage: if [ -f INSTALL.in ]; then \ cp INSTALL.in $(GENERIC_STAGE_DIR)/INSTALL; \ -# elinks -dump -no-references -no-numbering $(WEB_URL)install.html \ -# >> $(GENERIC_STAGE_DIR)/INSTALL; \ + elinks -dump -no-references -no-numbering $(WEB_URL)install.html \ + >> $(GENERIC_STAGE_DIR)/INSTALL; \ cp BUILD.in $(GENERIC_STAGE_DIR)/BUILD; \ -# elinks -dump -no-references -no-numbering $(WEB_URL)build-server.html \ -# >> $(GENERIC_STAGE_DIR)/BUILD; \ + elinks -dump -no-references -no-numbering $(WEB_URL)build-server.html \ + >> $(GENERIC_STAGE_DIR)/BUILD; \ else \ cp INSTALL $(GENERIC_STAGE_DIR); \ cp BUILD $(GENERIC_STAGE_DIR); \ diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index 5e4812a3..aeb958a7 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -18,11 +18,10 @@ package: clean make -C ../.. check_tools tar -zxvf $(TARBALL_DIR)/$(TARBALL) cp -r debian $(UNPACKED_DIR) - chmod a+x $(UNPACKED_DIR)/debian/rules - cp /home/hubert/work/tmp/rabbitmq-server-1.4.0.tar.gz $(UNPACKED_DIR)/rabbitmq-server-1.4.0.orig.tar.gz + chmod -R a+x $(UNPACKED_DIR)/debian UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR) -# cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) -# rm -rf $(UNPACKED_DIR) + cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) + rm -rf $(UNPACKED_DIR) clean: rm -rf $(UNPACKED_DIR) -- cgit v1.2.1