From 3932aeac122d9834ce3a6050c7756b8d9b6db2bb Mon Sep 17 00:00:00 2001 From: Jonas Termansen Date: Mon, 4 Nov 2024 21:35:07 +0100 Subject: [PATCH] Get DESTDIR from the environment and add distclean target. (#378) autoconf-based packages conventionally respect the DESTDIR environment variable rather needing to explicitly override it. Likewise the distclean target is conventionally named distclean rather than dist-clean. This change adds a top-level alias to be compatible. These changes are needed to build bochs on my infrastructure without having to special case bochs or locally patch it. --- bochs/Makefile.in | 4 ++-- bochs/doc/docbook/Makefile.in | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bochs/Makefile.in b/bochs/Makefile.in index c1e6ecb89..ed97eb58f 100644 --- a/bochs/Makefile.in +++ b/bochs/Makefile.in @@ -35,8 +35,6 @@ sharedir = $(datarootdir)/bochs top_builddir = . top_srcdir = $(srcdir) -DESTDIR = - VERSION=@VERSION@ REL_STRING=@REL_STRING@ MAN_PAGE_1_LIST=bochs bximage bochs-dlx @@ -606,6 +604,8 @@ all-clean: clean @CLEAN_DOCBOOK_VAR@ @CLEAN_PCIDEV_VAR@ $(MAKE) clean @CD_UP_ONE@ +distclean: dist-clean + dist-clean: local-dist-clean cd iodev @COMMAND_SEPARATOR@ $(MAKE) dist-clean diff --git a/bochs/doc/docbook/Makefile.in b/bochs/doc/docbook/Makefile.in index b9d5ba04c..1fc5a31d4 100644 --- a/bochs/doc/docbook/Makefile.in +++ b/bochs/doc/docbook/Makefile.in @@ -26,8 +26,6 @@ SGML_VALIDATE = nsgmls -s DOCBOOK2HTML = $(JADE) $(JADE_ARGS) endif -DESTDIR= - # name of the major documentation sections SECTIONS=user documentation development SECTION_HTML=$(SECTIONS:%=%/index.html)