Commit aae21e1b authored by Lasse Karstensen's avatar Lasse Karstensen

Merge branch 'master' into 4.0

parents da3d3043 516aeba2
...@@ -28,3 +28,4 @@ Makefile.in ...@@ -28,3 +28,4 @@ Makefile.in
/src/vcc_if.c /src/vcc_if.c
/src/vcc_if.h /src/vcc_if.h
/src/vmod_*rst
...@@ -7,6 +7,8 @@ DISTCHECK_CONFIGURE_FLAGS = \ ...@@ -7,6 +7,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
EXTRA_DIST = README.rst LICENSE vmod-example.spec debian EXTRA_DIST = README.rst LICENSE vmod-example.spec debian
doc_DATA = README.rst LICENSE
dist_man_MANS = vmod_example.3 dist_man_MANS = vmod_example.3
MAINTAINERCLEANFILES = $(dist_man_MANS) MAINTAINERCLEANFILES = $(dist_man_MANS)
......
Source: libvmod-example Source: libvmod-example
Section: web Section: web
Priority: extra Priority: extra
Maintainer: Lasse Karstensen <lkarsten@varnish-software.com> Maintainer: Varnish Software <support@varnish-software.com>
Build-Depends: debhelper (>= 7), build-essential, pkg-config, python-docutils, varnish (>= 4.0.2), libvarnishapi-dev (>= 4.0.2) Build-Depends: debhelper (>= 7),
build-essential,
pkg-config,
python-docutils,
varnish (>= 4.0.2),
libvarnishapi-dev (>= 4.0.2)
Standards-Version: 3.8.1 Standards-Version: 3.8.1
Vcs-Git: git://github.com/varnish/libvmod-example.git Vcs-Git: git://github.com/varnish/libvmod-example.git
Package: libvmod-example Package: libvmod-example
Architecture: any Architecture: any
Depends: varnish (>= 4.0.2), ${misc:Depends} Depends: varnish (>= 4.0.2), ${misc:Depends}, ${Varnish:ABI}
Description: Example vmod for Varnish Description: Example vmod for Varnish
README.rst README.rst
LICENSE LICENSE
COPYING
AM_CPPFLAGS = @VMOD_INCLUDES@ AM_CPPFLAGS = @VMOD_INCLUDES@ -Wall -Werror
vmoddir = @VMOD_DIR@ vmoddir = @VMOD_DIR@
vmod_LTLIBRARIES = libvmod_example.la vmod_LTLIBRARIES = libvmod_example.la
...@@ -21,6 +21,8 @@ $(top_srcdir)/src/tests/*.vtc: ...@@ -21,6 +21,8 @@ $(top_srcdir)/src/tests/*.vtc:
check: $(VMOD_TESTS) check: $(VMOD_TESTS)
EXTRA_DIST = vmod_example.vcc $(VMOD_TESTS) EXTRA_DIST = \
vmod_example.vcc \
$(VMOD_TESTS)
CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h
...@@ -20,22 +20,20 @@ Example VMOD ...@@ -20,22 +20,20 @@ Example VMOD
%build %build
%configure --prefix=/usr/ %configure --prefix=/usr/
make %{__make} %{?_smp_mflags}
make check %{__make} %{?_smp_mflags} check
%install %install
make install DESTDIR=%{buildroot} [ %{buildroot} != "/" ] && %{__rm} -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/doc/%{name}/ %{__make} install DESTDIR=%{buildroot}
cp README.rst %{buildroot}/usr/share/doc/%{name}/
cp LICENSE %{buildroot}/usr/share/doc/%{name}/
%clean %clean
rm -rf %{buildroot} [ %{buildroot} != "/" ] && %{__rm} -rf %{buildroot}
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/varnis*/vmods/ %{_libdir}/varnis*/vmods/
%doc /usr/share/doc/%{name}/* %doc /usr/share/doc/lib%{name}/*
%{_mandir}/man?/* %{_mandir}/man?/*
%changelog %changelog
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment