Skip to content
This repository
Browse code

Merge pull request #8 from abique/patch-1

Makefile: various fixes for install rules
  • Loading branch information...
commit af18a012a546f9caac801b99dacd24b4b53db3f7 2 parents 3dc7ab6 + 90df696
Le Wang authored November 08, 2012

Showing 1 changed file with 7 additions and 9 deletions. Show diff stats Hide diff stats

  1. 16  Makefile
16  Makefile
@@ -27,29 +27,27 @@ BATCH=$(EMACS) -batch -q -no-site-file -eval                             			\
27 27
 ELC= $(BATCH) -f batch-byte-compile
28 28
 
29 29
 # How to copy the lisp files and elc files to their distination.
30  
-CP = cp -p
  30
+CP = install -m 644
31 31
 
32 32
 ##----------------------------------------------------------------------
33 33
 ##  BELOW THIS LINE ON YOUR OWN RISK!
34 34
 ##----------------------------------------------------------------------
35 35
 
36 36
 # The following variables need to be defined by the maintainer
37  
-LISPF      = 	rebox2.el	 	\
  37
+LISPFILES   = 	rebox2.el	 	\
38 38
 
39  
-ELCFILES    = $(LISPF:.el=.elc)
  39
+ELCFILES    = $(LISPFILES:.el=.elc)
40 40
 
41 41
 default: $(ELCFILES)
42 42
 
43 43
 install: install-lisp
44 44
 
45 45
 install-lisp: $(LISPFILES) $(ELCFILES)
46  
-	if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;
47  
-	$(CP) $(LISPFILES)  $(lispdir)
48  
-	$(CP) $(ELCFILES)   $(lispdir)
49  
-
50  
-clean:
51  
-	${MAKE} cleanelc
  46
+	install -d -m 755 $(DESTDIR)$(lispdir)
  47
+	$(CP) $(LISPFILES) $(DESTDIR)$(lispdir)
  48
+	$(CP) $(ELCFILES) $(DESTDIR)$(lispdir)
52 49
 
  50
+clean: cleanelc
53 51
 cleanelc:
54 52
 	rm -f $(ELCFILES)
55 53
 

0 notes on commit af18a01

Please sign in to comment.
Something went wrong with that request. Please try again.