don't append wine to the default path settings

forwarded: not-needed

Gbp-Pq: Topic debianization
Gbp-Pq: Name install-paths.patch

diff --git a/configure.ac b/configure.ac
index d8f54033d44329f988dfbb9a195ce82203c35448..ef824291fc621ec4f1b05994e6550edc0646f454 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -95,9 +95,9 @@ AC_ARG_WITH(wine64,    AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i
 
 AC_CANONICAL_HOST
 
-AC_SUBST(dlldir,[\${libdir}/wine])
-AC_SUBST(fontdir,[\${datadir}/wine/fonts])
-AC_SUBST(nlsdir,[\${datadir}/wine/nls])
+AC_SUBST(dlldir,[\${libdir}])
+AC_SUBST(fontdir,[/usr/share/wine/fonts])
+AC_SUBST(nlsdir,[\${datadir}/nls])
 AC_SUBST(srcdir)
 
 dnl **** Check for some programs ****

diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 185bc563e68fa69b93130bf221accfe26f87d81c..a66cabd9fea92d11aaf64d3fc99738dfe690faf5 100644 (file)
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -75,4 +75,4 @@ unix_loader_EXTRADEFS = \
        -DBINDIR=\"${bindir}\" \
        -DSYSTEMDLLPATH=\"${system_dllpath}\" \
        -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \
-       -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\"
+       -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}`\"

diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 885a73265688f526c685b15c20a2ff9ef24a27d5..9036c95022379c18272e6fd72c92f1dccbc3072a 100644 (file)
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -93,7 +93,7 @@ config_EXTRADEFS = \
        -DLIB_TO_BINDIR=\"`${MAKEDEP} -R ${libdir} ${bindir}`\" \
        -DLIB_TO_DLLDIR=\"`${MAKEDEP} -R ${libdir} ${dlldir}`\" \
        -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" \
-       -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\"
+       -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}`\"
 
 SHAREDLIB = $(LIBWINE_SHAREDLIB)
 

diff --git a/tools/makedep.c b/tools/makedep.c
index e69dc3ce0a4a71ccdd39ed82353b3955fbff4003..d6ff280e849295e39725377141d7f1e1a4b5ccc3 100644 (file)
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2897,7 +2897,7 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c
     output( "%s:", obj_dir_path( make, obj ));
     output_filenames( source->dependencies );
     output( "\n" );
-    add_install_rule( make, obj, xstrdup( obj ), strmake( "d$(datadir)/wine/%s", obj ));
+    add_install_rule( make, obj, xstrdup( obj ), strmake( "d$(datadir)/%s", obj ));
 }