Skip to content

Commit 7240faf

Browse files
author
Sebastiano Merlino
committed
Adjusted errors in debian rules
1 parent 6efeefe commit 7240faf

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SUBDIRS = src $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR) $(LUA_DIR) $(PERL_DIR) $(RUBY
2828
DIST_SUBDIRS = $(SUBDIRS)
2929
EXTRA_DIST = libhttpserver.pc.in debian/changelog.in debian/control.in debian/rules.in debian/libhttpserver-dev.install.in debian/libhttpserver.install.in redhat/libhttpserver.SPEC.in $(DX_CONFIG) $(PYTHON_EXTRA) $(PHP_EXTRA) $(PERL_EXTRA)
3030

31-
MOSTLYCLEANFILES = $(DX_CLEANFILES) redhat/SOURCES/*
31+
MOSTLYCLEANFILES = $(DX_CLEANFILES) redhat/SOURCES/* $(top_srcdir)/src/java/*.java $(top_srcdir)/src/java/webserver_wrap.*
3232
DISTCLEANFILES = redhat/SOURCES/* redhat/SPEC/* redhat/* debian/* DIST_REVISION
3333

3434
pkgconfigdir = $(libdir)/pkgconfig

configure.ac

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
# Process this file with autoconf to produce a configure script.
2121

2222
AC_PREREQ(2.57)
23-
AC_INIT([libhttpserver], 0.1.2, [electrictwister2000@gmail.com])
24-
AM_INIT_AUTOMAKE([libhttpserver], 0.1.2)
23+
AC_INIT([libhttpserver], 0.2, [electrictwister2000@gmail.com])
24+
AM_INIT_AUTOMAKE([libhttpserver], 0.2)
2525
AC_CONFIG_HEADERS([config.h])
2626
AC_CONFIG_MACRO_DIR([m4])
2727

@@ -390,7 +390,13 @@ AC_OUTPUT(
390390
libhttpserver.pc
391391
Makefile
392392
src/Makefile
393-
$OUTPUT_LANG
393+
src/python/Makefile
394+
src/java/Makefile
395+
src/php/Makefile
396+
src/lua/Makefile
397+
src/perl/Makefile
398+
src/ruby/Makefile
399+
src/guile/Makefile
394400
debian/changelog
395401
debian/control
396402
debian/libhttpserver-dev.install

debian/rules.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
CURDIR =
77
DEB_SRCDIR = @abs_top_srcdir@
8-
DEB_DH_INSTALL_SOURCEDIR = debian/tmp
8+
DEB_DESTDIR = @abs_top_builddir@/debian/tmp
9+
DEB_DH_INSTALL_SOURCEDIR = @abs_top_builddir@/debian/tmp
910
DEB_BUILDDIR = @abs_top_builddir@/deb_build
1011
DEB_MAKE_CHECK_TARGET = check
1112

0 commit comments

Comments
 (0)