]>
Commit | Line | Data |
---|---|---|
38619a26 RW |
1 | --- ucblogo-5.2/emacs/makefile.orig Tue Dec 10 13:51:05 2002 |
2 | +++ ucblogo-5.2/emacs/makefile Tue Dec 10 13:50:48 2002 | |
3 | @@ -1,5 +1,5 @@ | |
4 | BUILDIR = `pwd` | |
5 | -INFODIR = $(prefix)/info | |
6 | +INFODIR = $(prefix)/share/info | |
7 | EMACSDIR = $(LIBLOC)/emacs | |
8 | DOCSDIR = $(LIBLOC)/docs | |
9 | HTMLDIR = $(DOCSDIR)/html | |
d79bfac0 | 10 | --- ucblogo-5.2/makefile.in.orig Tue Dec 10 13:46:05 2002 |
38619a26 RW |
11 | +++ ucblogo-5.2/makefile.in Tue Dec 10 14:09:43 2002 |
12 | @@ -4,7 +4,7 @@ | |
13 | LIBS = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@ | |
14 | prefix = @prefix@ | |
15 | BINDIR = $(prefix)/bin | |
16 | -LIBLOC = $(prefix)/lib/logo | |
17 | +LIBLOC = $(prefix)/share/logo | |
18 | ||
19 | # LIBLOC = `pwd` | |
20 | ||
21 | @@ -54,25 +54,25 @@ | |
dfc03498 RW |
22 | |
23 | clean: | |
24 | rm -f *.o libloc.c | |
25 | - cd emacs; gmake clean | |
d79bfac0 | 26 | + cd emacs; $(MAKE) clean |
dfc03498 RW |
27 | |
28 | ship: | |
29 | rm -f config.h config.cache config.log config.status | |
30 | rm -f makefile makehelp logo *.o libloc.c | |
31 | - cd emacs; gmake ship | |
32 | + cd emacs; $(MAKE) ship | |
33 | ||
34 | install: all | |
38619a26 RW |
35 | - for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done |
36 | - cp logo $(BINDIR)/. | |
37 | - cp -f logolib/* $(LIBLOC)/logolib/. | |
38 | - cp -f helpfiles/* $(LIBLOC)/helpfiles/. | |
39 | - cp -f csls/* $(LIBLOC)/csls/. | |
d79bfac0 | 40 | - (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) gmake install) |
38619a26 RW |
41 | + for d in $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBLOC) $(DESTDIR)$(LIBLOC)/logolib $(DESTDIR)$(LIBLOC)/helpfiles $(DESTDIR)$(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done |
42 | + cp logo $(DESTDIR)$(BINDIR)/. | |
43 | + cp -f logolib/* $(DESTDIR)$(LIBLOC)/logolib/. | |
44 | + cp -f helpfiles/* $(DESTDIR)$(LIBLOC)/helpfiles/. | |
45 | + cp -f csls/* $(DESTDIR)$(LIBLOC)/csls/. | |
46 | + (cd emacs; prefix=$(DESTDIR)$(prefix) LIBLOC=$(DESTDIR)$(LIBLOC) BINDIR=$(DESTDIR)$(BINDIR) $(MAKE) install) | |
d79bfac0 | 47 | # prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; gmake install |
dfc03498 RW |
48 | |
49 | logo-mode: | |
d79bfac0 RW |
50 | - (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) gmake) |
51 | + (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE)) | |
52 | # @prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; gmake | |
dfc03498 RW |
53 | |
54 | docs: | |
55 | - cd emacs; gmake docs | |
56 | + cd emacs; $(MAKE) docs |