From 60c8395eecdf01c95c8b6f4809e2f543d433f117 Mon Sep 17 00:00:00 2001 From: Chris Dickens Date: Thu, 9 Apr 2020 12:30:57 -0700 Subject: [PATCH] Makefiles: Remove target-specific variables Improve portability with non-GNU make by using standard variables. Signed-off-by: Chris Dickens --- Makefile.am | 4 ++-- doc/Makefile.in | 2 +- libusb/version_nano.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 047be991..09d7cf52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,9 +35,9 @@ dist-hook: rm -f $(distdir)/README.orig rm -f $(distdir)/msvc/.gitattributes +reldir = .release/$(distdir) +sfurl = frs.sourceforge.net:/home/frs/project/libusb/libusb-1.0 .PHONY: dist-upload -dist-upload: reldir = .release/$(distdir) -dist-upload: sfurl = frs.sourceforge.net:/home/frs/project/libusb/libusb-1.0 dist-upload: dist rm -rf $(reldir) mkdir -p $(reldir) diff --git a/doc/Makefile.in b/doc/Makefile.in index 3d835c50..26400b51 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -8,7 +8,7 @@ docs: @DOXYGEN_HTMLDIR@ @DOXYGEN_HTMLDIR@: doxygen.cfg libusb.png $(LIBUSB_DOC_SRC) doxygen $< -docs-upload: sfurl = web.sourceforge.net:/home/project-web/libusb/htdocs +sfurl = web.sourceforge.net:/home/project-web/libusb/htdocs docs-upload: @DOXYGEN_HTMLDIR@ if [ -z "$$SF_USER" ]; then \ rsync -rv --delete $< $(sfurl); \ diff --git a/libusb/version_nano.h b/libusb/version_nano.h index f5243a0e..a3ee32f5 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11489 +#define LIBUSB_NANO 11490