From 8c3b87ea7f2cd9b40c06f303ab71d7fd5ebe6d09 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 20 Jan 2016 00:38:51 +0000 Subject: [PATCH] Merged revisions 6782 via svnmerge from svn+ssh://svn.code.sf.net/p/scst/svn/trunk ........ r6782 | bvassche | 2016-01-19 16:35:29 -0800 (Tue, 19 Jan 2016) | 1 line user space code: Fix the code for generating a release archive ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.1.x@6783 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- usr/events/Makefile | 2 +- usr/fileio/Makefile | 2 +- usr/stpgd/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/events/Makefile b/usr/events/Makefile index ffce7d2d7..fa01f6b7f 100644 --- a/usr/events/Makefile +++ b/usr/events/Makefile @@ -97,6 +97,6 @@ extraclean: clean rm Makefile.aa release-archive: - ../../scripts/generate-release-archive events "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' events.c)" + ../../scripts/generate-release-archive events "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' ../include/version.h)" .PHONY: all install uninstall clean extraclean 2release 2debug 2perf diff --git a/usr/fileio/Makefile b/usr/fileio/Makefile index b91948369..5daa63b10 100644 --- a/usr/fileio/Makefile +++ b/usr/fileio/Makefile @@ -118,6 +118,6 @@ extraclean: clean rm Makefile.aa release-archive: - ../../scripts/generate-release-archive fileio_tgt "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' fileio.c)" + ../../scripts/generate-release-archive fileio_tgt "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' ../include/version.h)" .PHONY: all install uninstall clean extraclean 2release 2debug 2perf diff --git a/usr/stpgd/Makefile b/usr/stpgd/Makefile index 0f8336c95..3fa1e9bc7 100644 --- a/usr/stpgd/Makefile +++ b/usr/stpgd/Makefile @@ -99,6 +99,6 @@ extraclean: clean rm Makefile.aa release-archive: - ../../scripts/generate-release-archive stpgd "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' stpgd_main.c)" + ../../scripts/generate-release-archive stpgd "$$(sed -n 's/^#define[[:blank:]]VERSION_STR[[:blank:]]*\"\([^\"]*\)\".*/\1/p' ../include/version.h)" .PHONY: all install uninstall clean extraclean 2release 2debug 2perf