diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
| commit | 2f9bb5c7e744ddca3fbe5576e520a3e80c106c55 (patch) | |
| tree | 7a3d5d57a460aa87a8f8b58d46102ca339e97770 /src/bsdiff-4.3 | |
| parent | c5ba08133370f98de722c978bda3b446721985de (diff) | |
| parent | 6dca72006aa9b1cf2f226bb5b538e744fcab976f (diff) | |
Merge branch 'make'
Diffstat (limited to 'src/bsdiff-4.3')
| -rw-r--r-- | src/bsdiff-4.3/Makefile.am | 13 | ||||
| -rw-r--r-- | src/bsdiff-4.3/local.mk | 11 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/bsdiff-4.3/Makefile.am b/src/bsdiff-4.3/Makefile.am deleted file mode 100644 index 62315333a76a..000000000000 --- a/src/bsdiff-4.3/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -EXTRA_DIST = compat-include - -libexec_PROGRAMS = bsdiff bspatch - -bsdiff_SOURCES = bsdiff.c - -bsdiff_LDADD = -lbz2 - -bspatch_SOURCES = bspatch.c - -bspatch_LDADD = -lbz2 - -AM_CFLAGS = -O3 ${bsddiff_compat_include} diff --git a/src/bsdiff-4.3/local.mk b/src/bsdiff-4.3/local.mk new file mode 100644 index 000000000000..c957ceab0c0f --- /dev/null +++ b/src/bsdiff-4.3/local.mk @@ -0,0 +1,11 @@ +programs += bsdiff bspatch + +bsdiff_DIR := $(d) +bsdiff_SOURCES := $(d)/bsdiff.c +bsdiff_LDFLAGS = -lbz2 $(bsddiff_compat_include) +bsdiff_INSTALL_DIR = $(libexecdir)/nix + +bspatch_DIR := $(d) +bspatch_SOURCES := $(d)/bspatch.c +bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include) +bspatch_INSTALL_DIR = $(libexecdir)/nix |