diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2023-03-07 15:52:56 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2023-03-07 15:54:40 +0100 |
| commit | 59d031823d3c07325f6226096cc4778ed7170e32 (patch) | |
| tree | 40acc2b260be203d54bc0d91f4572bb4976a735b | |
| parent | 2d2d795348d4a382c5ae6e68d8d2390dbd574e7d (diff) | |
build/Makefile.common.inc: unset OSMO_REPOSITORY
Don't have a default value for OSMO_REPOSITORY, as this leads to manuals
getting uploaded to the wrong directory (publish) target and installed
to the wrong directory (install, uninstall).
Add checks to ensure the variable is set before using it in install and
uninstall.
Related: OS#5902
Change-Id: Ie21d58dd57a893a83f566eea464ab3eec82b67a4
| -rw-r--r-- | build/Makefile.common.inc | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index a9a8ddf..2bbd324 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -11,7 +11,6 @@ UPLOAD_PATH ?= generic@sysmocom-downloads:documents SYMLINKS = common build CLEAN_FILES += $(SYMLINKS) PDF_FILES = $(patsubst %.adoc,%.pdf,$(ASCIIDOC)) $(patsubst %.xml,%.pdf,$(VTY_REFERENCE)) -OSMO_REPOSITORY ?= osmo-gsm-manuals PUBLISH_REF ?= master PUBLISH_TEMPDIR = _publish_tmpdir @@ -49,6 +48,7 @@ publish: $(UPLOAD_FILES) # - installing manuals by default is fine, because Osmocom projects won't include # the whole Makefile.common.inc unless --enable-manuals is passed to configure. install: $(PDF_FILES) + [ -n "$(OSMO_REPOSITORY)" ] || exit 1 if [ "$(OSMO_GSM_MANUALS_NO_INSTALL)" != "1" ]; then \ for i in $(PDF_FILES); do \ install -vDm644 "$$i" "$(DESTDIR)$(prefix)/share/doc/$(OSMO_REPOSITORY)-doc/$$i" || exit 1; \ @@ -56,6 +56,7 @@ install: $(PDF_FILES) fi uninstall: + [ -n "$(OSMO_REPOSITORY)" ] || exit 1 if [ "$(OSMO_GSM_MANUALS_NO_INSTALL)" != "1" ]; then \ for i in $(PDF_FILES); do \ rm -v "$(DESTDIR)$(prefix)/share/doc/$(OSMO_REPOSITORY)-doc/$$i"; \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 784f61f..0761d48 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -34,6 +34,7 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc VTY_REFERENCE = test-vty-reference.xml test2-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc +OSMO_REPOSITORY = osmo-gsm-manuals include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc |