[vlc-commits] Move packaging files to their own subfolder

[Jean-Baptiste Kempf]

npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Dec 13 16:27:20 2012 +0100| [d23a864bc10dcb8bd627e6d4792eaf8b86c9b3bb] | committer: Jean-Baptiste Kempf

Move packaging files to their own subfolder

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=d23a864bc10dcb8bd627e6d4792eaf8b86c9b3bb
---

 configure.ac                           |   10 +++++-----
 npapi/Makefile.am                      |    2 +-
 npapi/{ => package}/install.js.in      |    0
 npapi/{ => package}/install.rdf.in     |    0
 npapi/{ => package}/manifest.json.in   |    0
 npapi/{ => package}/npvlc.dll.manifest |    0
 npapi/{ => package}/npvlc_rc.rc.in     |    0
 npapi/{ => package}/vlc.r.in           |    0
 8 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index e2e9bc5..351b66f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,21 +273,21 @@ AC_CONFIG_FILES([
   share/Makefile
   npapi/Makefile
   activex/Makefile
-  npapi/install.js
-  npapi/install.rdf
-  npapi/manifest.json
+  npapi/package/install.js
+  npapi/package/install.rdf
+  npapi/package/manifest.json
 ])
 
 AM_COND_IF([HAVE_WIN32], [
   AC_CONFIG_FILES([
-    npapi/npvlc_rc.rc
+    npapi/package/npvlc_rc.rc
     activex/axvlc.inf
     activex/axvlc_rc.rc
   ])
 ])
 AM_COND_IF([HAVE_DARWIN], [
   AC_CONFIG_FILES([
-    npapi/vlc.r
+    npapi/package/vlc.r
     extras/macosx/Info.plist
     extras/macosx/InstallerInfo.plist
   ])
diff --git a/npapi/Makefile.am b/npapi/Makefile.am
index 499d04a..b97cbcf 100644
--- a/npapi/Makefile.am
+++ b/npapi/Makefile.am
@@ -2,7 +2,7 @@
 # Building the Mozilla plugin
 ###############################################################################
 
-EXTRA_DIST = npvlc_rc.rc.in npvlc.dll.manifest
+EXTRA_DIST = package/npvlc_rc.rc.in package/npvlc.dll.manifest
 MOSTLYCLEANFILES =
 CLEANFILES = $(BUILT_SOURCES)
 npvlcdir = $(libdir)/mozilla/plugins
diff --git a/npapi/install.js.in b/npapi/package/install.js.in
similarity index 100%
rename from npapi/install.js.in
rename to npapi/package/install.js.in
diff --git a/npapi/install.rdf.in b/npapi/package/install.rdf.in
similarity index 100%
rename from npapi/install.rdf.in
rename to npapi/package/install.rdf.in
diff --git a/npapi/manifest.json.in b/npapi/package/manifest.json.in
similarity index 100%
rename from npapi/manifest.json.in
rename to npapi/package/manifest.json.in
diff --git a/npapi/npvlc.dll.manifest b/npapi/package/npvlc.dll.manifest
similarity index 100%
rename from npapi/npvlc.dll.manifest
rename to npapi/package/npvlc.dll.manifest
diff --git a/npapi/npvlc_rc.rc.in b/npapi/package/npvlc_rc.rc.in
similarity index 100%
rename from npapi/npvlc_rc.rc.in
rename to npapi/package/npvlc_rc.rc.in
diff --git a/npapi/vlc.r.in b/npapi/package/vlc.r.in
similarity index 100%
rename from npapi/vlc.r.in
rename to npapi/package/vlc.r.in