aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-09-23 14:33:05 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-09-24 13:06:39 +0200
commit9738dfa897e9558390580a36325180bfb02d6f72 (patch)
tree4104f1a7cb02cbeffe174b709411bb1e10942fe1
parentd5944e2225f6e27d0b83cd50a117d1b79aa82a53 (diff)
Rename binary to binaries to fix building a debian package
dh will execute the binary rule and this will not do anything as a directory with that name already exists..
-rw-r--r--Makefile.am2
-rw-r--r--binaries/Makefile.am (renamed from binary/Makefile.am)2
-rw-r--r--configure.ac2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 17062c9..7f175ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = binary def_frame def_list
+SUBDIRS = binaries def_frame def_list
if HAVE_LIBXML2
SUBDIRS += test_apps
diff --git a/binary/Makefile.am b/binaries/Makefile.am
index 9b61e9f..308acac 100644
--- a/binary/Makefile.am
+++ b/binaries/Makefile.am
@@ -9,7 +9,7 @@ include $(top_srcdir)/test_pdu/Makefile.am
include $(top_srcdir)/test_apps/Makefile.am
include $(top_srcdir)/src/Makefile.am
-LDADD = $(top_builddir)/binary/libsmpp34.la
+LDADD = $(top_builddir)/binaries/libsmpp34.la
AM_CPPFLAGS = -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS
AM_CFLAGS = @CFLAGS@ -Wall -fPIC # -static
INCLUDES = -I../src -I..
diff --git a/configure.ac b/configure.ac
index 29f851c..6d5b3b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,6 @@ AC_CHECK_FUNCS([memset])
AC_OUTPUT([Makefile
def_frame/Makefile
def_list/Makefile
- binary/Makefile
+ binaries/Makefile
test_apps/Makefile
libsmpp34.pc])