Patchwork Install the libraries in pkglib

login
register
mail settings
Submitter Keng-Yu Lin
Date July 3, 2012, 9:23 a.m.
Message ID <1341307437-32354-1-git-send-email-kengyu@canonical.com>
Download mbox | patch
Permalink /patch/168746/
State Accepted
Headers show

Comments

Keng-Yu Lin - July 3, 2012, 9:23 a.m.
For now these libraries are for fwts only, so it is more proper to install
them in the "private" pkglib directory (/usr/lib/fwts/*).

Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
---
 debian/libfwts1.install                |    2 +-
 debian/libfwtsacpica1.install          |    2 +-
 debian/libfwtsiasl1.install            |    2 +-
 src/acpica/Makefile.am                 |    2 +-
 src/acpica/source/compiler/Makefile.am |    2 +-
 src/lib/src/Makefile.am                |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
Colin King - July 3, 2012, 9:41 a.m.
On 03/07/12 10:23, Keng-Yu Lin wrote:
> For now these libraries are for fwts only, so it is more proper to install
> them in the "private" pkglib directory (/usr/lib/fwts/*).
>
> Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
> ---
>   debian/libfwts1.install                |    2 +-
>   debian/libfwtsacpica1.install          |    2 +-
>   debian/libfwtsiasl1.install            |    2 +-
>   src/acpica/Makefile.am                 |    2 +-
>   src/acpica/source/compiler/Makefile.am |    2 +-
>   src/lib/src/Makefile.am                |    2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/debian/libfwts1.install b/debian/libfwts1.install
> index 2ac324c..c65e209 100644
> --- a/debian/libfwts1.install
> +++ b/debian/libfwts1.install
> @@ -1 +1 @@
> -usr/lib/libfwts.so.* usr/lib
> +usr/lib/fwts/libfwts.so.* usr/lib/fwts
> diff --git a/debian/libfwtsacpica1.install b/debian/libfwtsacpica1.install
> index 6213e40..a411a7a 100644
> --- a/debian/libfwtsacpica1.install
> +++ b/debian/libfwtsacpica1.install
> @@ -1 +1 @@
> -usr/lib/libfwtsacpica.so.* usr/lib
> +usr/lib/fwts/libfwtsacpica.so.* usr/lib/fwts
> diff --git a/debian/libfwtsiasl1.install b/debian/libfwtsiasl1.install
> index 043c75f..e94d910 100644
> --- a/debian/libfwtsiasl1.install
> +++ b/debian/libfwtsiasl1.install
> @@ -1 +1 @@
> -usr/lib/libfwtsiasl.so.* usr/lib
> +usr/lib/fwts/libfwtsiasl.so.* usr/lib/fwts
> diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am
> index 7d1249c..3187432 100644
> --- a/src/acpica/Makefile.am
> +++ b/src/acpica/Makefile.am
> @@ -41,7 +41,7 @@ BUILT_SOURCES = osunixxf_munged.c dscontrol_munged.c
>
>   CLEANFILES = osunixxf_munged.c
>
> -lib_LTLIBRARIES = libfwtsacpica.la
> +pkglib_LTLIBRARIES = libfwtsacpica.la
>   libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0
>   libfwtsacpica_la_SOURCES = \
>   	fwts_acpica.c \
> diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am
> index 74ae927..cee1f4f 100644
> --- a/src/acpica/source/compiler/Makefile.am
> +++ b/src/acpica/source/compiler/Makefile.am
> @@ -48,7 +48,7 @@ prparserparse.c: prparser.y
>   prparserlex.c: prparser.l
>   	${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c prparser.l
>
> -lib_LTLIBRARIES = libfwtsiasl.la
> +pkglib_LTLIBRARIES = libfwtsiasl.la
>
>   BUILT_SOURCES = aslcompilerparse.c aslcompilerlex.c \
>   		dtparserparse.c dtparserlex.c \
> diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
> index f846621..ea97cdb 100644
> --- a/src/lib/src/Makefile.am
> +++ b/src/lib/src/Makefile.am
> @@ -4,7 +4,7 @@ AM_CPPFLAGS = \
>   	-I$(top_srcdir)/src/acpica/source/compiler \
>   	-Wall -Werror
>
> -lib_LTLIBRARIES = libfwts.la
> +pkglib_LTLIBRARIES = libfwts.la
>   libfwts_la_LDFLAGS = -lpcre -lpthread -ljson -version-info 1:0:0 \
>   	-L$(top_srcdir)/src/acpica/source/compiler -lfwtsiasl
>
>
Yep, good point. Well spotted.

Acked-by: Colin Ian King <colin.king@canonical.com>
Alex Hung - July 3, 2012, 10:36 a.m.
On 07/03/2012 05:23 PM, Keng-Yu Lin wrote:
> For now these libraries are for fwts only, so it is more proper to install
> them in the "private" pkglib directory (/usr/lib/fwts/*).
>
> Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
> ---
>   debian/libfwts1.install                |    2 +-
>   debian/libfwtsacpica1.install          |    2 +-
>   debian/libfwtsiasl1.install            |    2 +-
>   src/acpica/Makefile.am                 |    2 +-
>   src/acpica/source/compiler/Makefile.am |    2 +-
>   src/lib/src/Makefile.am                |    2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/debian/libfwts1.install b/debian/libfwts1.install
> index 2ac324c..c65e209 100644
> --- a/debian/libfwts1.install
> +++ b/debian/libfwts1.install
> @@ -1 +1 @@
> -usr/lib/libfwts.so.* usr/lib
> +usr/lib/fwts/libfwts.so.* usr/lib/fwts
> diff --git a/debian/libfwtsacpica1.install b/debian/libfwtsacpica1.install
> index 6213e40..a411a7a 100644
> --- a/debian/libfwtsacpica1.install
> +++ b/debian/libfwtsacpica1.install
> @@ -1 +1 @@
> -usr/lib/libfwtsacpica.so.* usr/lib
> +usr/lib/fwts/libfwtsacpica.so.* usr/lib/fwts
> diff --git a/debian/libfwtsiasl1.install b/debian/libfwtsiasl1.install
> index 043c75f..e94d910 100644
> --- a/debian/libfwtsiasl1.install
> +++ b/debian/libfwtsiasl1.install
> @@ -1 +1 @@
> -usr/lib/libfwtsiasl.so.* usr/lib
> +usr/lib/fwts/libfwtsiasl.so.* usr/lib/fwts
> diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am
> index 7d1249c..3187432 100644
> --- a/src/acpica/Makefile.am
> +++ b/src/acpica/Makefile.am
> @@ -41,7 +41,7 @@ BUILT_SOURCES = osunixxf_munged.c dscontrol_munged.c
>
>   CLEANFILES = osunixxf_munged.c
>
> -lib_LTLIBRARIES = libfwtsacpica.la
> +pkglib_LTLIBRARIES = libfwtsacpica.la
>   libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0
>   libfwtsacpica_la_SOURCES = \
>   	fwts_acpica.c \
> diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am
> index 74ae927..cee1f4f 100644
> --- a/src/acpica/source/compiler/Makefile.am
> +++ b/src/acpica/source/compiler/Makefile.am
> @@ -48,7 +48,7 @@ prparserparse.c: prparser.y
>   prparserlex.c: prparser.l
>   	${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c prparser.l
>
> -lib_LTLIBRARIES = libfwtsiasl.la
> +pkglib_LTLIBRARIES = libfwtsiasl.la
>
>   BUILT_SOURCES = aslcompilerparse.c aslcompilerlex.c \
>   		dtparserparse.c dtparserlex.c \
> diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
> index f846621..ea97cdb 100644
> --- a/src/lib/src/Makefile.am
> +++ b/src/lib/src/Makefile.am
> @@ -4,7 +4,7 @@ AM_CPPFLAGS = \
>   	-I$(top_srcdir)/src/acpica/source/compiler \
>   	-Wall -Werror
>
> -lib_LTLIBRARIES = libfwts.la
> +pkglib_LTLIBRARIES = libfwts.la
>   libfwts_la_LDFLAGS = -lpcre -lpthread -ljson -version-info 1:0:0 \
>   	-L$(top_srcdir)/src/acpica/source/compiler -lfwtsiasl
>
>

Acked-by: Alex Hung <alex.hung@canonical.com>
Alex Hung - July 3, 2012, 10:37 a.m.
On 07/03/2012 05:23 PM, Keng-Yu Lin wrote:
> For now these libraries are for fwts only, so it is more proper to install
> them in the "private" pkglib directory (/usr/lib/fwts/*).
>
> Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
> ---
>   debian/libfwts1.install                |    2 +-
>   debian/libfwtsacpica1.install          |    2 +-
>   debian/libfwtsiasl1.install            |    2 +-
>   src/acpica/Makefile.am                 |    2 +-
>   src/acpica/source/compiler/Makefile.am |    2 +-
>   src/lib/src/Makefile.am                |    2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/debian/libfwts1.install b/debian/libfwts1.install
> index 2ac324c..c65e209 100644
> --- a/debian/libfwts1.install
> +++ b/debian/libfwts1.install
> @@ -1 +1 @@
> -usr/lib/libfwts.so.* usr/lib
> +usr/lib/fwts/libfwts.so.* usr/lib/fwts
> diff --git a/debian/libfwtsacpica1.install b/debian/libfwtsacpica1.install
> index 6213e40..a411a7a 100644
> --- a/debian/libfwtsacpica1.install
> +++ b/debian/libfwtsacpica1.install
> @@ -1 +1 @@
> -usr/lib/libfwtsacpica.so.* usr/lib
> +usr/lib/fwts/libfwtsacpica.so.* usr/lib/fwts
> diff --git a/debian/libfwtsiasl1.install b/debian/libfwtsiasl1.install
> index 043c75f..e94d910 100644
> --- a/debian/libfwtsiasl1.install
> +++ b/debian/libfwtsiasl1.install
> @@ -1 +1 @@
> -usr/lib/libfwtsiasl.so.* usr/lib
> +usr/lib/fwts/libfwtsiasl.so.* usr/lib/fwts
> diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am
> index 7d1249c..3187432 100644
> --- a/src/acpica/Makefile.am
> +++ b/src/acpica/Makefile.am
> @@ -41,7 +41,7 @@ BUILT_SOURCES = osunixxf_munged.c dscontrol_munged.c
>
>   CLEANFILES = osunixxf_munged.c
>
> -lib_LTLIBRARIES = libfwtsacpica.la
> +pkglib_LTLIBRARIES = libfwtsacpica.la
>   libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0
>   libfwtsacpica_la_SOURCES = \
>   	fwts_acpica.c \
> diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am
> index 74ae927..cee1f4f 100644
> --- a/src/acpica/source/compiler/Makefile.am
> +++ b/src/acpica/source/compiler/Makefile.am
> @@ -48,7 +48,7 @@ prparserparse.c: prparser.y
>   prparserlex.c: prparser.l
>   	${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c prparser.l
>
> -lib_LTLIBRARIES = libfwtsiasl.la
> +pkglib_LTLIBRARIES = libfwtsiasl.la
>
>   BUILT_SOURCES = aslcompilerparse.c aslcompilerlex.c \
>   		dtparserparse.c dtparserlex.c \
> diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
> index f846621..ea97cdb 100644
> --- a/src/lib/src/Makefile.am
> +++ b/src/lib/src/Makefile.am
> @@ -4,7 +4,7 @@ AM_CPPFLAGS = \
>   	-I$(top_srcdir)/src/acpica/source/compiler \
>   	-Wall -Werror
>
> -lib_LTLIBRARIES = libfwts.la
> +pkglib_LTLIBRARIES = libfwts.la
>   libfwts_la_LDFLAGS = -lpcre -lpthread -ljson -version-info 1:0:0 \
>   	-L$(top_srcdir)/src/acpica/source/compiler -lfwtsiasl
>
>


Acked-by: Alex Hung <alex.hung@canonical.com>

Patch

diff --git a/debian/libfwts1.install b/debian/libfwts1.install
index 2ac324c..c65e209 100644
--- a/debian/libfwts1.install
+++ b/debian/libfwts1.install
@@ -1 +1 @@ 
-usr/lib/libfwts.so.* usr/lib
+usr/lib/fwts/libfwts.so.* usr/lib/fwts
diff --git a/debian/libfwtsacpica1.install b/debian/libfwtsacpica1.install
index 6213e40..a411a7a 100644
--- a/debian/libfwtsacpica1.install
+++ b/debian/libfwtsacpica1.install
@@ -1 +1 @@ 
-usr/lib/libfwtsacpica.so.* usr/lib
+usr/lib/fwts/libfwtsacpica.so.* usr/lib/fwts
diff --git a/debian/libfwtsiasl1.install b/debian/libfwtsiasl1.install
index 043c75f..e94d910 100644
--- a/debian/libfwtsiasl1.install
+++ b/debian/libfwtsiasl1.install
@@ -1 +1 @@ 
-usr/lib/libfwtsiasl.so.* usr/lib
+usr/lib/fwts/libfwtsiasl.so.* usr/lib/fwts
diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am
index 7d1249c..3187432 100644
--- a/src/acpica/Makefile.am
+++ b/src/acpica/Makefile.am
@@ -41,7 +41,7 @@  BUILT_SOURCES = osunixxf_munged.c dscontrol_munged.c
 
 CLEANFILES = osunixxf_munged.c
 
-lib_LTLIBRARIES = libfwtsacpica.la
+pkglib_LTLIBRARIES = libfwtsacpica.la
 libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0
 libfwtsacpica_la_SOURCES = \
 	fwts_acpica.c \
diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am
index 74ae927..cee1f4f 100644
--- a/src/acpica/source/compiler/Makefile.am
+++ b/src/acpica/source/compiler/Makefile.am
@@ -48,7 +48,7 @@  prparserparse.c: prparser.y
 prparserlex.c: prparser.l
 	${LEX} ${AM_LFLAGS} -PPrParser -oprparserlex.c prparser.l
 
-lib_LTLIBRARIES = libfwtsiasl.la
+pkglib_LTLIBRARIES = libfwtsiasl.la
 
 BUILT_SOURCES = aslcompilerparse.c aslcompilerlex.c \
 		dtparserparse.c dtparserlex.c \
diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
index f846621..ea97cdb 100644
--- a/src/lib/src/Makefile.am
+++ b/src/lib/src/Makefile.am
@@ -4,7 +4,7 @@  AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/acpica/source/compiler \
 	-Wall -Werror
 
-lib_LTLIBRARIES = libfwts.la
+pkglib_LTLIBRARIES = libfwts.la
 libfwts_la_LDFLAGS = -lpcre -lpthread -ljson -version-info 1:0:0 \
 	-L$(top_srcdir)/src/acpica/source/compiler -lfwtsiasl