|
Lines 1-5
Link Here
|
| 1 |
--- Makefile.orig 2008-02-01 00:06:38.000000000 +1100 |
1 |
--- Makefile.orig 2008-02-01 00:06:38.000000000 +1100 |
| 2 |
+++ Makefile 2008-02-23 20:45:58.000000000 +1100 |
2 |
+++ Makefile 2008-07-29 13:09:58.000000000 +1000 |
| 3 |
@@ -21,7 +21,7 @@ |
3 |
@@ -21,7 +21,7 @@ |
| 4 |
|
4 |
|
| 5 |
# Set this to "emacs" or "xemacs" according to your version of Emacs. |
5 |
# Set this to "emacs" or "xemacs" according to your version of Emacs. |
|
Lines 30-36
Link Here
|
| 30 |
|
30 |
|
| 31 |
## Compiling can show up errors in the code, but be wary of fixing obsoletion |
31 |
## Compiling can show up errors in the code, but be wary of fixing obsoletion |
| 32 |
## or argument call warnings unless they're valid for both Emacsen. |
32 |
## or argument call warnings unless they're valid for both Emacsen. |
| 33 |
@@ -85,7 +84,7 @@ |
33 |
@@ -85,10 +84,10 @@ |
| 34 |
@echo "****************************************************************" |
34 |
@echo "****************************************************************" |
| 35 |
@echo " Byte compiling... " |
35 |
@echo " Byte compiling... " |
| 36 |
@echo "****************************************************************" |
36 |
@echo "****************************************************************" |
|
Lines 38-44
Link Here
|
| 38 |
+ $(MAKE) elc |
38 |
+ $(MAKE) elc |
| 39 |
@echo " Byte compiling X-Symbol..." |
39 |
@echo " Byte compiling X-Symbol..." |
| 40 |
(cd x-symbol/lisp; $(MAKE) EMACS="$(EMACS) -q -no-site-file") |
40 |
(cd x-symbol/lisp; $(MAKE) EMACS="$(EMACS) -q -no-site-file") |
| 41 |
echo $(EMACS) > $(@) |
41 |
- echo $(EMACS) > $(@) |
|
|
42 |
+ echo $(EMACS_NAME) > $(@) |
| 43 |
@echo "****************************************************************" |
| 44 |
@echo " Finished." |
| 45 |
@echo "****************************************************************" |
| 42 |
@@ -137,39 +136,35 @@ |
46 |
@@ -137,39 +136,35 @@ |
| 43 |
# Set Elisp directories according to paths used in Red Hat RPMs |
47 |
# Set Elisp directories according to paths used in Red Hat RPMs |
| 44 |
# (which may or may not be official Emacs policy). We generate |
48 |
# (which may or may not be official Emacs policy). We generate |
|
Lines 107-113
Link Here
|
| 107 |
- for f in ${EXTRA_DIRS}; do cp -prf $$f/* ${ELISP}/$$f; done |
111 |
- for f in ${EXTRA_DIRS}; do cp -prf $$f/* ${ELISP}/$$f; done |
| 108 |
- for f in ${ELISP_EXTRAS}; do cp -pf $$f ${ELISP}/$$f; done |
112 |
- for f in ${ELISP_EXTRAS}; do cp -pf $$f ${ELISP}/$$f; done |
| 109 |
+ for f in ${ELISP_DIRS}; do ${BSD_INSTALL_DATA} $$f/*.el ${ELISP}/$$f; done |
113 |
+ for f in ${ELISP_DIRS}; do ${BSD_INSTALL_DATA} $$f/*.el ${ELISP}/$$f; done |
| 110 |
+ for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_DATA} $$f ${ELISP}/$$f; done |
114 |
+ for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_SCRIPT} $$f ${ELISP}/$$f; done |
| 111 |
+ for f in ${EXTRA_DIRS}; \ |
115 |
+ for f in ${EXTRA_DIRS}; \ |
| 112 |
+ do for g in `find -d $$f -type d`; \ |
116 |
+ do for g in `find -d $$f -type d`; \ |
| 113 |
+ do mkdir -p ${ELISP}/$$g; \ |
117 |
+ do mkdir -p ${ELISP}/$$g; \ |
|
Lines 124-130
Link Here
|
| 124 |
- for f in ${ELISP_DIRS}; do cp -pf $$f/*.elc ${ELISP}/$$f; done |
128 |
- for f in ${ELISP_DIRS}; do cp -pf $$f/*.elc ${ELISP}/$$f; done |
| 125 |
- for f in ${ELISP_EXTRAS}; do cp -pf $$f ${ELISP}/$$f; done |
129 |
- for f in ${ELISP_EXTRAS}; do cp -pf $$f ${ELISP}/$$f; done |
| 126 |
+ for f in ${ELISP_DIRS}; do ${BSD_INSTALL_DATA} $$f/*.elc ${ELISP}/$$f; done |
130 |
+ for f in ${ELISP_DIRS}; do ${BSD_INSTALL_DATA} $$f/*.elc ${ELISP}/$$f; done |
| 127 |
+ for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_DATA} $$f ${ELISP}/$$f; done |
131 |
+ for f in ${ELISP_EXTRAS}; do ${BSD_INSTALL_SCRIPT} $$f ${ELISP}/$$f; done |
| 128 |
|
132 |
|
| 129 |
install-init: |
133 |
install-init: |
| 130 |
mkdir -p ${ELISP_START} |
134 |
mkdir -p ${ELISP_START} |