packaging/debs: Use make conditionals instead of Bourne shell ones
[#131645209]
This commit is contained in:
parent
73faea2b45
commit
e83a170f91
|
@ -60,15 +60,14 @@ package: clean
|
||||||
# before starting a possibly long build. At the same time, display some
|
# before starting a possibly long build. At the same time, display some
|
||||||
# useful informations on the key so the caller can double-check if he
|
# useful informations on the key so the caller can double-check if he
|
||||||
# wants.
|
# wants.
|
||||||
@set -e; \
|
ifneq ($(SIGNING_KEY),)
|
||||||
if test "$(SIGNING_KEY)"; then \
|
@echo
|
||||||
echo; \
|
@echo '--------------------------------------------------'
|
||||||
echo '--------------------------------------------------'; \
|
@echo "The package will be signed with key $(SIGNING_KEY):"
|
||||||
echo "The package will be signed with key $(SIGNING_KEY):"; \
|
@gpg -K "$(SIGNING_KEY)"
|
||||||
gpg -K "$(SIGNING_KEY)"; \
|
@echo '--------------------------------------------------'
|
||||||
echo '--------------------------------------------------'; \
|
@echo
|
||||||
echo; \
|
endif
|
||||||
fi
|
|
||||||
# Because we are creating a source package as well, Debian expects the
|
# Because we are creating a source package as well, Debian expects the
|
||||||
# source archive to have a specially formatted name. Copy the original
|
# source archive to have a specially formatted name. Copy the original
|
||||||
# archive to a correctly named file.
|
# archive to a correctly named file.
|
||||||
|
@ -94,17 +93,17 @@ package: clean
|
||||||
# Before we remove the source directory, copy the possibly updated
|
# Before we remove the source directory, copy the possibly updated
|
||||||
# debian/changelog to the original debian subdirectory, if the caller
|
# debian/changelog to the original debian subdirectory, if the caller
|
||||||
# asks for it. He is then responsible for committing it.
|
# asks for it. He is then responsible for committing it.
|
||||||
if test "$(SAVE_DEBIAN_CHANGELOG)" = 'yes'; then \
|
ifeq ($(SAVE_CHANGELOG),yes)
|
||||||
cp -a "$(UNPACKED_DIR)/debian/changelog" debian/changelog; \
|
cp -a "$(UNPACKED_DIR)/debian/changelog" debian/changelog
|
||||||
fi
|
endif
|
||||||
rm -rf "$(UNPACKED_DIR)"
|
rm -rf "$(UNPACKED_DIR)"
|
||||||
# If $(PACKAGES_DIR) is specified, move all package files to that
|
# If $(PACKAGES_DIR) is specified, move all package files to that
|
||||||
# location.
|
# location.
|
||||||
if test "$(PACKAGES_DIR)"; then \
|
ifneq ($(PACKAGES_DIR),)
|
||||||
mkdir -p "$(PACKAGES_DIR)"; \
|
mkdir -p "$(PACKAGES_DIR)"
|
||||||
mv $$(./scripts/get-debian-package-files-list.sh $(CHANGES_FILE)) \
|
mv $$(./scripts/get-debian-package-files-list.sh $(CHANGES_FILE)) \
|
||||||
"$(PACKAGES_DIR)"; \
|
"$(PACKAGES_DIR)"
|
||||||
fi
|
endif
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf $(UNPACKED_DIR)
|
rm -rf $(UNPACKED_DIR)
|
||||||
|
|
Loading…
Reference in New Issue