[vlc-commits] Makefile: use pkgdatadir and remove vlcdatadir

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Mar  5 23:17:05 2018 +0200| [e1bac00ddb061d3cd38358511a72b49f38241de5] | committer: Rémi Denis-Courmont

Makefile: use pkgdatadir and remove vlcdatadir

The original idea was to use versioned directories akin to gstreamer,
but no distributions ever did that with VLC. vlcdatadir was always the
same as pkgdatadir.

This reverts half of commit 56988959488ac0a479e52d63c1ad155f69c59be1.

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

 configure.ac      |  4 ----
 share/Makefile.am | 16 ++++++++--------
 src/Makefile.am   |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce9e6fd2a2..af8c3a348e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,10 +33,6 @@ AM_MAINTAINER_MODE([enable])
 dnl
 dnl Directories
 dnl
-dnl vlcincludedir="\${includedir}/\${PKGDIR}"
-dnl AC_SUBST(vlcincludedir)
-vlcdatadir="\${datadir}/\${PKGDIR}"
-AC_SUBST(vlcdatadir)
 vlclibdir="\${libdir}/\${PKGDIR}"
 AC_SUBST(vlclibdir)
 
diff --git a/share/Makefile.am b/share/Makefile.am
index 6d8cd9dc2f..deb75e6b29 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -34,7 +34,7 @@ icons128dir = $(iconsdatadir)/128x128/apps
 icons256dir = $(iconsdatadir)/256x256/apps
 
 if !HAVE_WIN32
-dist_vlcdata_DATA = icons/vlc.ico
+dist_pkgdata_DATA = icons/vlc.ico
 dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
 dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \
 			icons/32x32/vlc-xmas.xpm
@@ -43,7 +43,7 @@ dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-xmas.png \
                      icons/128x128/vlc-kb.png
 dist_icons256_DATA = icons/256x256/vlc.png
 
-nobase_dist_vlcdata_SCRIPTS = \
+nobase_dist_pkgdata_SCRIPTS = \
 	utils/gnome-vlc-default.sh \
 	utils/audio-vlc-default.sh \
 	utils/video-vlc-default.sh \
@@ -56,12 +56,12 @@ EXTRA_DIST += \
 	$(DIST_http_lua) \
 	$(DIST_solid)
 
-nobase_vlcdata_DATA =
+nobase_pkgdata_DATA =
 nobase_vlclib_DATA =
-nobase_dist_vlcdata_DATA =
+nobase_dist_pkgdata_DATA =
 if BUILD_SKINS
-nobase_vlcdata_DATA += skins2/default.vlt
-nobase_dist_vlcdata_DATA += $(DIST_skins2)
+nobase_pkgdata_DATA += skins2/default.vlt
+nobase_dist_pkgdata_DATA += $(DIST_skins2)
 endif
 if KDE_SOLID
 soliddata_DATA = $(DIST_solid)
@@ -177,7 +177,7 @@ nobase_doc_DATA = \
 	lua/sd/icast.lua \
 	$(NULL)
 
-nobase_dist_vlcdata_DATA += \
+nobase_dist_pkgdata_DATA += \
 	lua/http/view.html \
 	lua/http/mobile.html \
 	lua/http/dialogs/create_stream.html \
@@ -238,7 +238,7 @@ nobase_dist_vlcdata_DATA += \
 	lua/http/js/jquery.jstree.js \
 	lua/http/js/controllers.js
 endif
-MOSTLYCLEANFILES += $(nobase_vlcdata_DATA)
+MOSTLYCLEANFILES += $(nobase_pkgdata_DATA)
 
 EXTRA_DIST += \
 	lua/README.txt \
diff --git a/src/Makefile.am b/src/Makefile.am
index 6954b01929..f4617120d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -170,7 +170,7 @@ lib_LTLIBRARIES = libvlccore.la
 AM_CPPFLAGS = $(INCICONV) $(IDN_CFLAGS) \
 	-DMODULE_STRING=\"core\" \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DPKGDATADIR=\"$(vlcdatadir)\" \
+	-DPKGDATADIR=\"$(pkgdatadir)\" \
 	-DPKGLIBDIR=\"$(vlclibdir)\"
 AM_CFLAGS = $(CFLAGS_libvlccore)
 if HAVE_DYNAMIC_PLUGINS