[wdiff-bugs] Cygwin-bug#20070822T0857: Makefile.in install fixes

[Jari Aalto]

Package: wdiff
Version: 0.5
Status: 
Severity: normal

Here is patch to modernize Makefile.in

Jari

diff -r a55394b9754b Makefile.in
--- a/Makefile.in       Wed Aug 22 11:41:31 2007 +0300
+++ b/Makefile.in       Wed Aug 22 11:57:01 2007 +0300
@@ -42,8 +42,8 @@ exec_prefix = @exec_prefix@
 exec_prefix = @exec_prefix@
 transform = @program_transform_name@
 bindir = $(exec_prefix)/bin
-infodir = $(prefix)/info
-mandir = $(prefix)/man/man1
+infodir = $(prefix)/share/info
+mandir = $(prefix)/share/man/man1
 manext = .1
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -129,13 +129,13 @@ check: wdiff
 check: wdiff
        $(srcdir)/check_it
 
-install: all
-       $(srcdir)/mkinstalldirs $(bindir) $(infodir)
+install: all install-man
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(infodir)
        for name in $(PROGRAMS); do \
          $(INSTALL_PROGRAM) $$name \
-               $(bindir)/`echo $$name | sed '$(transform)'`; \
-       done
-       $(INSTALL_DATA) $(srcdir)/wdiff.info $(infodir)/wdiff.info
+               $(DESTDIR)$(bindir)/`echo $$name | sed '$(transform)'`; \
+       done
+       $(INSTALL_DATA) $(srcdir)/wdiff.info $(DESTDIR)$(infodir)/wdiff.info
 
 uninstall:
        for name in $(PROGRAMS); do
@@ -147,9 +147,9 @@ uninstall:
 # GNU and switch to Info.  The following is for irreductible fellows.
 
 install-man:
-       $(srcdir)/mkinstalldirs $(mandir)
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
        $(INSTALL_DATA) $(srcdir)/wdiff.1 \
-               $(mandir)/`echo wdiff | sed '$(transform)'`$(manext)
+               $(DESTDIR)$(mandir)/`echo wdiff | sed '$(transform)'`$(manext)
 
 uninstall-man:
        rm -f $(mandir)/`echo wdiff | sed '$(transform)'`$(manext); \


-- System Information
Release: Windows 2000 Professional Ver 5.0 Build 2195 Service Pack 4
Kernel: 1.5.24 api 0.156 cvs cr-0x5f1 (cygwin1.dll)
Locale: 

-- Other package information
Info-Pkg-devel-tools: gcc 3.4.4-3, make 3.81-1, libtool 1.5b-2, automake 2-1
Info-Pkg-lang: perl 5.8.8-4, python 2.5.1-2, ruby 1.8.6-1

-- Environment information
CYGWIN: server