summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Dickens <christopher.a.dickens@gmail.com>2020-04-09 12:30:57 -0700
committerChris Dickens <christopher.a.dickens@gmail.com>2020-04-09 12:30:57 -0700
commit60c8395eecdf01c95c8b6f4809e2f543d433f117 (patch)
treebd9590c1ef250789cdbc2c53c26327e1239d3f67
parent33b3ba3fc71ada906bfeb05eee937661c32b2877 (diff)
downloadlibusb-60c8395eecdf01c95c8b6f4809e2f543d433f117.tar.gz
Makefiles: Remove target-specific variables
Improve portability with non-GNU make by using standard variables. Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
-rw-r--r--Makefile.am4
-rw-r--r--doc/Makefile.in2
-rw-r--r--libusb/version_nano.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 047be99..09d7cf5 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 3d835c5..26400b5 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 f5243a0..a3ee32f 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11489
+#define LIBUSB_NANO 11490