commit ec05b39dd0c877441049608b8bc6eec440253019
author Linux Build Service Account <lnxbuild@localhost> Sat Oct 12 02:23:15 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Oct 12 02:23:15 2013 -0700
tree e4f7f6fcf7e394ebfe66c2e987aa39c1d909f1e6
parent 5adad1f14456e5e17e2dd707e3d3e968c4e5db60
parent c6ae03cda215714eee24210051915d7d5bf938af

Merge "Makefiles: Rename data-opensource to data-oss"

configure.ac

diff --git a/configure.ac b/configure.ac
index 4ce67b7..3ee0340 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.65])
-AC_INIT(data-opensource, 1.0.0)
-AM_INIT_AUTOMAKE(data-opensource, 1.0.0)
-AC_OUTPUT(Makefile rmnetctl/src/Makefile rmnetctl/cli/Makefile data-opensource.pc)
+AC_INIT(data-oss, 1.0.0)
+AM_INIT_AUTOMAKE(data-oss, 1.0.0)
+AC_OUTPUT(Makefile rmnetctl/src/Makefile rmnetctl/cli/Makefile data-oss.pc)
 AC_CONFIG_SRCDIR([rmnetctl/src/librmnetctl.c])
 #AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

data-oss.pc.in

diff --git a/data-opensource.pc.in b/data-oss.pc.in
similarity index 73%
rename from data-opensource.pc.in
rename to data-oss.pc.in
index 1e343ef..7c268df 100644
--- a/data-opensource.pc.in
+++ b/data-oss.pc.in
@@ -3,8 +3,8 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: data-opensource
+Name: data-oss
 Description: Data Opensource Components
 Version: @VERSION@
 Libs: -L${libdir} -lrmnetctl
-Cflags: -I${includedir}/data-opensource
+Cflags: -I${includedir}/data-oss