Support for tweaking package-part of install path

I kept include files to ../vlc otherwise #include syntax would break

Now, it's up to changing PKGDIR="vlc" to PKGDIR="vlc-1.0".
We just need to decide.

diff --git a/configure.ac b/configure.ac
index f1b844ce3789b0ccdb7bad015dcaf5ea4684c19d..3f956165366bebb60836783609486a57c8086e07 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,8 @@ VERSION_MAJOR="1"
 VERSION_MINOR="0"
 VERSION_REVISION="0"
 VERSION_EXTRA="-git"
+PKGDIR="vlc"
+AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="Goldeneye"
@@ -32,6 +34,16 @@ AS_IF([test "x${enable_maintainer_mode}" != "xno"],
        [enable_maintainer_mode="yes"])
 AM_MAINTAINER_MODE
 
+dnl
+dnl Directories
+dnl
+dnl vlcincludedir="\${includedir}/\${PKGDIR}"
+dnl AC_SUBST(vlcincludedir)
+vlcdatadir="\${datadir}/\${PKGDIR}"
+AC_SUBST(vlcdatadir)
+vlclibdir="\${libdir}/\${PKGDIR}"
+AC_SUBST(vlclibdir)
+
 dnl
 dnl  Deprecated options
 dnl  to notify packagers that stuff has changed

diff --git a/modules/common.am b/modules/common.am
index 233e17a38408f18a6638dd12e4c4dac1f740d2c2..413986296430d7b0a254f8521c42cf66cb4439c8 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -7,7 +7,7 @@
 
 NULL =
 SUFFIXES =
-libvlcdir = $(libdir)/vlc/$(basedir)
+libvlcdir = $(vlclibdir)/$(basedir)
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/share/Makefile.am b/share/Makefile.am
index 18f4e06c15126e580e6937ca24c8733d81576540..86675074730081dbc54689f08e9d8e9c8e7c7de5 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,22 +1,20 @@
-MOSTLYCLEANFILES = $(nobase_pkgdata_DATA) 
-
-pkgdatadir = $(datadir)/vlc
+MOSTLYCLEANFILES = $(nobase_vlcdata_DATA)
 
 nobase_dist_data_DATA = applications/vlc.desktop
 
-dist_pkgdata_DATA = \
+dist_vlcdata_DATA = \
        $(DIST_icons) \
        $(DIST_icons16) \
        $(DIST_icons32) \
        $(DIST_icons48) \
        $(DIST_icons128)
-nobase_dist_pkgdata_SCRIPTS = \
+nobase_dist_vlcdata_SCRIPTS = \
        utils/gnome-vlc-default.sh \
        utils/audio-vlc-default.sh \
        utils/video-vlc-default.sh \
        $(NULL)
 
-nobase_dist_pkgdata_DATA = $(NULL)
+nobase_dist_vlcdata_DATA = $(NULL)
 
 EXTRA_DIST = \
        $(DIST_rsrc) \
@@ -31,31 +29,31 @@ EXTRA_DIST = \
        $(DIST_maemo)
 
 if BUILD_SKINS
-nobase_pkgdata_DATA = skins2/default.vlt
-nobase_dist_pkgdata_DATA += $(DIST_skins2)
+nobase_vlcdata_DATA = skins2/default.vlt
+nobase_dist_vlcdata_DATA += $(DIST_skins2)
 endif
 if BUILD_PDA
-nobase_dist_pkgdata_DATA += $(DIST_pda)
+nobase_dist_vlcdata_DATA += $(DIST_pda)
 endif
 if BUILD_HTTPD
-nobase_dist_pkgdata_DATA += $(DIST_http)
+nobase_dist_vlcdata_DATA += $(DIST_http)
 endif
 if BUILD_OSDMENU
-nobase_dist_pkgdata_DATA += \
+nobase_dist_vlcdata_DATA += \
        $(DIST_osdmenu_default)
 endif
 if BUILD_LUA
-nobase_dist_pkgdata_DATA += $(DIST_lua)
+nobase_dist_vlcdata_DATA += $(DIST_lua)
 if BUILD_HTTPD
-nobase_dist_pkgdata_DATA += $(DIST_http_lua)
+nobase_dist_vlcdata_DATA += $(DIST_http_lua)
 endif
 endif
 if BUILD_MOZILLA
 # TODO: move to the mozilla directory
-nobase_dist_pkgdata_DATA += $(DIST_mozilla)
+nobase_dist_vlcdata_DATA += $(DIST_mozilla)
 endif
 if BUILD_MAEMO
-nobase_dist_pkgdata_DATA += $(DIST_maemo)
+nobase_dist_vlcdata_DATA += $(DIST_maemo)
 endif
 
 DIST_rsrc = \

diff --git a/src/Makefile.am b/src/Makefile.am
index e3d2e7fbfbcdafcf271fe0139125caebb11578e3..4ab1dceab25ba9dae4fac7743ae6d48637869cd8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -177,9 +177,9 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
        -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
-       -DDATA_PATH=\"$(pkgdatadir)\" \
+       -DDATA_PATH=\"$(vlcdatadir)\" \
        -DLIBDIR=\"$(libdir)\" \
-       -DPLUGIN_PATH=\"$(pkglibdir)\"
+       -DPLUGIN_PATH=\"$(vlclibdir)\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
        -export-symbols $(srcdir)/libvlccore.sym \
        -version-info 1:0:0