From 2386380c72b9e6eca7b87060c22975485524ddbe Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Tue, 12 Jul 2011 20:11:15 +0200
Subject: [PATCH] change defaults to something that should work on most Linux
 systems and Cygwin

* default.mk: change prefix to /usr/share and do some formatting

This change establishes the baseline installation path that should work
out-of-the-box on Linux and Cygwin when the install is done system-wide (which
needs administrator privileges).
---
 default.mk | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/default.mk b/default.mk
index 4bd396ba3..802105af0 100644
--- a/default.mk
+++ b/default.mk
@@ -3,16 +3,16 @@
 ##----------------------------------------------------------------------
 
 # Name of your emacs binary
-EMACS=emacs
+EMACS   = emacs
 
 # Where local software is found
-prefix=/usr/local
+prefix  = /usr/share
 
 # Where local lisp files go.
-lispdir   = $(prefix)/share/emacs/site-lisp
+lispdir = $(prefix)/emacs/site-lisp
 
 # Where info files go.
-infodir = $(prefix)/share/info
+infodir = $(prefix)/info
 
 ##----------------------------------------------------------------------
 ## YOU MAY NEED TO EDIT THESE
@@ -20,28 +20,29 @@ infodir = $(prefix)/share/info
 
 # Using emacs in batch mode.
 
-BATCH=$(EMACS) -batch -q -no-site-file -eval                             			\
-  "(setq load-path (cons (expand-file-name \"./lisp/\") (cons \"$(lispdir)\" load-path)))"
+BATCH   = $(EMACS) -batch -q -no-site-file -eval                        \
+          "(setq load-path (cons (expand-file-name \"./lisp/\")         \
+                                 (cons \"$(lispdir)\" load-path)))"
 
 # Specify the byte-compiler for compiling org-mode files
-ELC= $(BATCH) -f batch-byte-compile
+ELC     = $(BATCH) -f batch-byte-compile
 
 # How to make a pdf file from a texinfo file
 TEXI2PDF = texi2pdf
 
 # How to create directories
-MKDIR = mkdir -p
+MKDIR   = mkdir -p
 
 # How to create the info files from the texinfo file
 MAKEINFO = makeinfo
 
 # How to create the HTML file
 TEXI2HTML = makeinfo --html --number-sections
-TEXI2HTMLNOPSLIT = makeinfo --html --no-split --number-sections
 
-# How to copy the lisp files and elc files to their distination.
-CP = cp -p
+# How to copy the lisp files and elc files to their destination.
+# CP    = cp -p         # try this if there is no install
+CP      = install -p
 
 # Name of the program to install info files
-INSTALL_INFO=install-info
+INSTALL_INFO = install-info