2008-10-07 Atsushi Enomoto <atsushi@ximian.com>

	* scripts/mono-nunit.pc.in, data/mono-nunit.pc.in:
	  move former to latter.
	* scripts/Makefile.am : remove packaging info.
	* data/Makefile.am : add mono-nunit.pc too.

svn path=/trunk/mono/; revision=115060

diff --git a/ChangeLog b/ChangeLog
index 18f7b3bd713f18030b1c3eacf9433a9a15620cca..ec2e10b37ce06fd7cb8e4aa7ba341e6e96f4e626 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-07  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * scripts/mono-nunit.pc.in, data/mono-nunit.pc.in:
+         move former to latter.
+       * scripts/Makefile.am : remove packaging info.
+       * data/Makefile.am : add mono-nunit.pc too.
+
 2008-10-03  Rodrigo Kumpera  <rkumpera@novell.com>
 
        * configure.in: Add simd intrinsics to the disable set.

diff --git a/data/Makefile.am b/data/Makefile.am
index ff9f9a3a0793d9b2800cad85836472fc4d5a04fb..9e79d0de3c6019dc972e2246ee16c07bb3b9e11e 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,13 +6,13 @@ EXTRA_DIST =          \
        config.in \
        browscap.ini mono.supp mono.d README \
        mono.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in \
-       mono-cairo.pc.in cecil.pc.in smcs.pc.in
+       mono-nunit.pc.in mono-cairo.pc.in cecil.pc.in smcs.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 
 if JIT_SUPPORTED
 if INTERP_SUPPORTED
-pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-cairo.pc cecil.pc smcs.pc
+pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc cecil.pc smcs.pc
 else
 pkgconfig_DATA= mono.pc dotnet.pc dotnet35.pc wcf.pc mono-cairo.pc cecil.pc smcs.pc
 endif
@@ -20,7 +20,7 @@ else
 pkgconfig_DATA= mint.pc mono-cairo.pc cecil.pc smcs.pc
 endif
 
-DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-cairo.pc cecil.pc smcs.pc
+DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc cecil.pc smcs.pc
 
 mono_DATA =  config \
             browscap.ini

diff --git a/data/mono-nunit.pc.in b/data/mono-nunit.pc.in
new file mode 100644 (file)
index 0000000..5447917
--- /dev/null
+++ b/data/mono-nunit.pc.in
@@ -0,0 +1,9 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+
+
+Name: Mono NUnit
+Description: Mono's version of NUnit
+Version: @VERSION@
+Libs: -r:${libdir}/mono/1.0/nunit.core.dll -r:${libdir}/mono/1.0/nunit.framework.dll -r:${libdir}/mono/1.0/nunit.util.dll

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index cf9ef505891da1934047b60a3bfd280894d9dda9..1327c040f1f9bbc9704d5da1995e5a06b387e4ef 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -121,9 +121,6 @@ scripts_service = mono-service mono-service2
 scripts_nunit = nunit-console$(SCRIPT_SUFFIX) nunit-console2$(SCRIPT_SUFFIX)
 scripts_rpmhelpers = mono-find-provides mono-find-requires
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= mono-nunit.pc
-
 CLEANFILES = $(scripts_1_0) $(scripts_1_0_umask) $(scripts_2_0) $(scripts_2_1) $(scripts_defaults) $(scripts_1_0_compat) mono-service mono-service2 nunit-console nunit-console2 mono-find-provides mono-find-requires 
 DISTCLEANFILES = $(pkgconfig_DATA) $(scripts_rpmhelpers)
 

diff --git a/scripts/mono-nunit.pc.in b/scripts/mono-nunit.pc.in
deleted file mode 100644 (file)
index 5447917..0000000
--- a/scripts/mono-nunit.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-
-Name: Mono NUnit
-Description: Mono's version of NUnit
-Version: @VERSION@
-Libs: -r:${libdir}/mono/1.0/nunit.core.dll -r:${libdir}/mono/1.0/nunit.framework.dll -r:${libdir}/mono/1.0/nunit.util.dll