[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.32-1-655-gb15233c

[Ove Kaaven]

The following commit has been merged in the master branch:
commit d8252a6d519b563c0c68dc5f96fe886ba447e087
Merge: dcc7a6b55f9d77a18245aa7cac80cee3419c6bc7 c9c3eff3f7ff333881fb7bb2400faf65ee2fdc04
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Sat Nov 14 18:01:30 2009 +0100

    Merge branch 'deb/paths'

diff --combined tools/winedump/Makefile.in
index bee2fcc,8220abd..6a1ff9d
--- a/tools/winedump/Makefile.in
+++ b/tools/winedump/Makefile.in
@@@ -3,7 -3,6 +3,7 @@@ TOPOBJDIR = ../.
  SRCDIR    = @srcdir@
  VPATH     = @srcdir@
  EXEEXT    = @EXEEXT@
 +DEFS      = -D__WINESRC__ $(EXTRADEFS)
  
  PROGRAMS = winedump$(EXEEXT)
  MANPAGES = winedump.man
@@@ -32,6 -31,8 +32,8 @@@ C_SRCS = 
  
  INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)
  
+ MODCFLAGS = -DDATADIR=\"$(datadir)/wine/\"
+ 
  all: $(PROGRAMS) $(MANPAGES)
  
  @MAKE_RULES@
@@@ -42,7 -43,7 +44,7 @@@ winedump$(EXEEXT): $(OBJS
  install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS)
  	$(INSTALL_PROGRAM) winedump$(EXEEXT) $(DESTDIR)$(bindir)/winedump$(EXEEXT)
  	$(INSTALL_DATA) winedump.man $(DESTDIR)$(mandir)/man$(prog_manext)/winedump.$(prog_manext)
- 	$(INSTALL_SCRIPT) $(SRCDIR)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl
+ 	$(INSTALL_SCRIPT) $(SRCDIR)/function_grep.pl $(DESTDIR)$(datadir)/wine/function_grep.pl
  
  uninstall::
  	$(RM) $(DESTDIR)$(bindir)/function_grep.pl $(DESTDIR)$(bindir)/winedump$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/winedump.$(prog_manext)

-- 
Debian Wine packaging