diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2014-06-11 06:45:30 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2014-06-11 06:45:30 -0700 |
| commit | b2eebed31eff3243c75726818ca0c7f2868e3182 (patch) | |
| tree | a12e0e4d3809e1d53d902d96c0003e4c310e5df6 /Makefile | |
| parent | 79f55cbf6c6e7412473e119a02aa637e985721f5 (diff) | |
| download | txr-b2eebed31eff3243c75726818ca0c7f2868e3182.tar.gz txr-b2eebed31eff3243c75726818ca0c7f2868e3182.tar.bz2 txr-b2eebed31eff3243c75726818ca0c7f2868e3182.zip | |
* Makefile (txr.o): Pass TXR_VER preprocessor symbol on gcc command
line.
(PREINSTALL): New variable holding a step for the install recipe.
(pax tar zip): New targets.
* configure (txr_ver): Version now added to config.make, passed
through to txr.c.
(gen_config_make): bindir, datadir and mandir are established
using gmake's regular macro assignment (=) rather than
expanding assignment (:=). This allows us to override the
prefix variable after configure time.
* lib.h (wli_noex): New macro.
(wli): Retarget to wli_noex, so that argument is subject
to macro replacement.
* txr.c (version): Use TXR_VER defined on compiler command line,
rather than hard-coded string literal.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 20 insertions, 0 deletions
@@ -78,6 +78,7 @@ y.tab.o: CFLAGS += -Dlint txr.o: CFLAGS += -DTXR_REL_PATH=\"$(bindir_rel)/$(PROG)$(EXE)\" txr.o: CFLAGS += -DEXE_SUFF=\"$(EXE)\" -DPROG_NAME=\"$(PROG)\" +txr.o: CFLAGS += -DTXR_VER=\"$(txr_ver)\" $(MPI_OBJS): CFLAGS += -DXMALLOC=chk_malloc -DXREALLOC=chk_realloc $(MPI_OBJS): CFLAGS += -DXCALLOC=chk_calloc -DXFREE=free @@ -160,11 +161,30 @@ define INSTALL touch -r $(2) $(3)/$(notdir $(2)) endef +PREINSTALL := : + .PHONY: install install: $(PROG) + $(PREINSTALL) $(call INSTALL,0755,txr,$(DESTDIR)$(bindir)) $(call INSTALL,0444,$(top_srcdir)/txr.1,$(DESTDIR)$(mandir)/man1) +.PHONY: unixtar tar zip + +pax tar zip: DESTDIR=pkg +pax tar zip: prefix= +pax tar zip: PREINSTALL=rm -rf pkg + +pax: install + cd pkg; find . | pax -w -f ../txr-$(txr_ver)-bin.tar -x ustar . + compress txr-$(txr_ver)-bin.tar + +tar: install + tar -C pkg -cZf txr-$(txr_ver)-bin.tar.Z . + +zip: install + cd pkg; zip -r ../txr-$(txr_ver)-bin.zip . + # # Install the tests as well as the script to run them # |