Fix the paths for a chroot build and for FHS

Gbp-Pq: Name Fix-the-paths-for-a-chroot-build-and-for-FHS.patch

diff --git a/Makefile.in b/Makefile.in
index 79c5fd9156d44b1cba07c4a124907862237c2b6b..59fe47bc6eda24ff02d0e40c546d74bbd0367f52 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,10 +34,10 @@ exec_prefix =               @exec_prefix@
 # to be different than those used for actually reference files at
 # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
 # when installing files.
-INSTALL_ROOT =
+INSTALL_ROOT = $(DESTDIR)
 
 # Directory in which to install the .a or .so binary for the XPA library:
-LIB_INSTALL_DIR =      $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR =      $(INSTALL_ROOT)$(exec_prefix)/lib/${DEB_HOST_MULTIARCH}
 
 # Directory in which to install the program wish:
 BIN_INSTALL_DIR =      $(INSTALL_ROOT)$(exec_prefix)/bin
@@ -46,7 +46,7 @@ BIN_INSTALL_DIR =     $(INSTALL_ROOT)$(exec_prefix)/bin
 INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include
 
 # Top-level directory for manual entries:
-MAN_INSTALL_DIR =      $(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR =      $(INSTALL_ROOT)$(prefix)/share/man
 
 # Top-level directory for share entries:
 MAN_SHARE_DIR =                $(INSTALL_ROOT)$(prefix)/share/xpa
@@ -275,7 +275,7 @@ install-binaries: $(LIB) $(PROGS)
            do \
            if [ ! -d $$i ] ; then \
                echo "Making directory $$i"; \
-               mkdir $$i; \
+               mkdir -p $$i; \
                chmod 755 $$i; \
                else true; \
                fi; \
@@ -297,14 +297,22 @@ install-binaries: $(LIB) $(PROGS)
 install-man:
        @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
            echo "Making directory $(MAN_INSTALL_DIR)"; \
-           mkdir $(MAN_INSTALL_DIR); \
+           mkdir -p $(MAN_INSTALL_DIR); \
            chmod 755 $(MAN_INSTALL_DIR); \
            else true; \
        fi;
        @-(for i in `ls ./man/man?/*.?` ; \
            do \
-               B=`basename $$i`; \
-               E=`echo $$i | awk -F. '{print $$NF}'`; \
+               B=`basename $$i | sed s/\\\\.n/.7/`; \
+               E=`echo $$i | awk -F. '{print $$NF}' | sed s/n/7/`; \
+               case $$B in \
+                       xpatcl.7) \
+                               B=xpa.3tcl; \
+                               E=3;; \
+                       xpachanges.1) \
+                               B=xpachanges.7; \
+                               E=7;; \
+               esac; \
                M="$(MAN_INSTALL_DIR)/man$$E"; \
                if [ ! -d $$M ] ; then \
                    echo "Making directory $$M"; \
@@ -314,6 +322,8 @@ install-man:
                fi; \
                echo "Installing $$B" ; \
                $(INSTALL_DATA) $$i $$M/$$B; \
+               sed -i "s/^\\\&\\\fB\(.*\):\(.*\)\\\fR/\1 \- \2/g" $$M/$$B ; \
+               sed -i "s/xpa(n)/xpa(7)/g" $$M/$$B ; \
            done;)
 
 install-share: