Patchwork Add autotools scripts for the data directory

login
register
mail settings
Submitter Keng-Yu Lin
Date Sept. 21, 2012, 9:22 a.m.
Message ID <1348219321-31203-1-git-send-email-kengyu@canonical.com>
Download mbox | patch
Permalink /patch/185637/
State Accepted
Headers show

Comments

Keng-Yu Lin - Sept. 21, 2012, 9:22 a.m.
The json files in the data directory has no automake/autoconf
scripts that handle the installation.

It works before because the Debian packaging tool does
the installation.

But as we now release fwts as tarballs. It is better to get this
done by the autotools.

Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
---
 Makefile.am      |    2 +-
 configure.ac     |    1 +
 data/Makefile.am |    2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 data/Makefile.am
Colin King - Sept. 21, 2012, 12:49 p.m.
On 21/09/12 10:22, Keng-Yu Lin wrote:
> The json files in the data directory has no automake/autoconf
> scripts that handle the installation.
>
> It works before because the Debian packaging tool does
> the installation.
>
> But as we now release fwts as tarballs. It is better to get this
> done by the autotools.
>
> Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
> ---
>   Makefile.am      |    2 +-
>   configure.ac     |    1 +
>   data/Makefile.am |    2 ++
>   3 files changed, 4 insertions(+), 1 deletion(-)
>   create mode 100644 data/Makefile.am
>
> diff --git a/Makefile.am b/Makefile.am
> index 26226b0..09f5bec 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,3 +1,3 @@
> -SUBDIRS = src
> +SUBDIRS = src data
>
>   ACLOCAL_AMFLAGS = -I m4
> diff --git a/configure.ac b/configure.ac
> index dd7e76e..48481aa 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -81,5 +81,6 @@
>   	   src/acpica/Makefile
>              src/lib/Makefile
>              src/lib/src/Makefile
> +           data/Makefile
>             ])
>             AC_OUTPUT
> diff --git a/data/Makefile.am b/data/Makefile.am
> new file mode 100644
> index 0000000..f9ee508
> --- /dev/null
> +++ b/data/Makefile.am
> @@ -0,0 +1,2 @@
> +fwtsdatadir = $(pkgdatadir)
> +fwtsdata_DATA = klog.json syntaxcheck.json
>
I completely overlooked that. Thanks Keng-Yu

Acked-by: Colin Ian King <colin.king@canonical.com>
Ivan Hu - Sept. 24, 2012, 8:14 a.m.
On 09/21/2012 05:22 PM, Keng-Yu Lin wrote:
> The json files in the data directory has no automake/autoconf
> scripts that handle the installation.
>
> It works before because the Debian packaging tool does
> the installation.
>
> But as we now release fwts as tarballs. It is better to get this
> done by the autotools.
>
> Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
> ---
>   Makefile.am      |    2 +-
>   configure.ac     |    1 +
>   data/Makefile.am |    2 ++
>   3 files changed, 4 insertions(+), 1 deletion(-)
>   create mode 100644 data/Makefile.am
>
> diff --git a/Makefile.am b/Makefile.am
> index 26226b0..09f5bec 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,3 +1,3 @@
> -SUBDIRS = src
> +SUBDIRS = src data
>
>   ACLOCAL_AMFLAGS = -I m4
> diff --git a/configure.ac b/configure.ac
> index dd7e76e..48481aa 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -81,5 +81,6 @@
>   	   src/acpica/Makefile
>              src/lib/Makefile
>              src/lib/src/Makefile
> +           data/Makefile
>             ])
>             AC_OUTPUT
> diff --git a/data/Makefile.am b/data/Makefile.am
> new file mode 100644
> index 0000000..f9ee508
> --- /dev/null
> +++ b/data/Makefile.am
> @@ -0,0 +1,2 @@
> +fwtsdatadir = $(pkgdatadir)
> +fwtsdata_DATA = klog.json syntaxcheck.json
>

Acked-by: Ivan Hu <ivan.hu@canonical.com>

Patch

diff --git a/Makefile.am b/Makefile.am
index 26226b0..09f5bec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@ 
-SUBDIRS = src
+SUBDIRS = src data
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index dd7e76e..48481aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,5 +81,6 @@ 
 	   src/acpica/Makefile
            src/lib/Makefile
            src/lib/src/Makefile
+           data/Makefile
           ])
           AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..f9ee508
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,2 @@ 
+fwtsdatadir = $(pkgdatadir)
+fwtsdata_DATA = klog.json syntaxcheck.json