summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2012-07-12 11:42:27 +0200
committerAndreas Baumann <abaumann@yahoo.com>2012-07-12 11:42:27 +0200
commitf46befc3af192f94d9f4503a6c2b3c69913e33c6 (patch)
treec4f18143ace8b9d258a40f14ae8c701f4ad0575e
parent1d1b82274564204ebddbd8103b16e7950491fbec (diff)
downloadnagios-plugin-curl-f46befc3af192f94d9f4503a6c2b3c69913e33c6.tar.gz
nagios-plugin-curl-f46befc3af192f94d9f4503a6c2b3c69913e33c6.tar.bz2
more debian packaging fixes
-rwxr-xr-xdebian/rules6
-rw-r--r--makefiles/compiler.mk2
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/rules b/debian/rules
index 18595a5..d788972 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,9 +59,9 @@ install: build
# Add here commands to install the package
# The DESTDIR Has To Be Exactly /usr/src/packages/BUILD/debian/<nameOfPackage>
- # main package
- $(MAKE) install $(PGFUSE_PARAMS) \
- DESTDIR=/usr/src/packages/BUILD/debian/wolframe
+ # install
+ mkdir -p /usr/src/packages/BUILD/debian/usr/lib/$(DEB_HOST_MULTIARCH)/nagios/plugins/
+ install -D -m0755 src/check_curl /usr/src/packages/BUILD/debian/usr/lib/$(DEB_HOST_MULTIARCH)/nagios/plugins/
# --- end custom part for installing
diff --git a/makefiles/compiler.mk b/makefiles/compiler.mk
index 63f7806..073364b 100644
--- a/makefiles/compiler.mk
+++ b/makefiles/compiler.mk
@@ -140,7 +140,7 @@ CCPP_LINK = $(CCPP)
$(CCPP) -c -o $@ $(CCPPFLAGS) $<
%$(EXE): %.o $(OBJS)
- $(CCPP_LINK) -o $@ $(LIBS) $(OBJS) $<
+ $(LINK) -o $@ $(LIBS) $(OBJS) $<
%.sho : %.c
$(CC) -c -o $@ -fPIC -DSHARED $(CFLAGS) $<