diff -Nur smsclient-2.0.9a.orig/config/Makefile.config.linux smsclient-2.0.9a/config/Makefile.config.linux
--- smsclient-2.0.9a.orig/config/Makefile.config.linux	2006-02-25 12:52:12.203797250 +0200
+++ smsclient-2.0.9a/config/Makefile.config.linux	2006-02-25 12:52:38.837461750 +0200
@@ -39,7 +39,7 @@
 PLATFORM = -DLINUX
 CC       = gcc
 MAKE     = make
-CFLAGS   = -O2 -g -I. -Wall -pedantic -fsigned-char $(PLATFORM)
+CFLAGS   += -I. -Wall -pedantic -fsigned-char $(PLATFORM)
 XTRALIBS = 
 
 # --------------------------------------------------------------------
@@ -59,7 +59,7 @@
 MLOCALSMSRC   = .sms_addressbook
 MGLOBALSMSRC  = $(ETCPREFIX)/etc/smsclient/sms_addressbook
 MSERVICEDIR   = $(ETCPREFIX)/etc/smsclient
-MLIBDIR	      = $(PREFIX)/usr/lib/smsclient
+MLIBDIR	      = $(PREFIX)/usr/share/smsclient
 MLOGFILE      = $(LOGDIR)/smsclient.log
 MSNPPDLOGFILE = $(LOGDIR)/smsclient.snppdlog
 MSMSDLOGFILE  = $(LOGDIR)/smsclient.smsdlog
@@ -80,10 +80,10 @@
 
 # --------------------------------------------------------------------
 
-BINDIR  = $(DESTDIR)/usr/bin
-ETCDIR  = $(DESTDIR)/etc
-LIBDIR	= $(DESTDIR)/usr/lib
-MANDIR  = $(DESTDIR)/usr/share/man
+BINDIR  = /usr/bin
+ETCDIR  = /etc
+LIBDIR	= /usr/lib
+MANDIR  = /usr/share/man
 MANEXT  = 1
 INSTALL = /usr/bin/install
 RM      = /bin/rm -f
diff -Nur smsclient-2.0.9a.orig/sms/Makefile smsclient-2.0.9a/sms/Makefile
--- smsclient-2.0.9a.orig/sms/Makefile	2006-02-25 12:52:12.203797250 +0200
+++ smsclient-2.0.9a/sms/Makefile	2006-02-25 12:49:49.166858000 +0200
@@ -34,28 +34,26 @@
 all:
 
 install: 
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(MLIBDIR)/services
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/errors
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/locks
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/incoming
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/named_pipes
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/services
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(MSERVICEDIR)/scripts
+	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -m 755 -d $(DESTDIR)$(MLIBDIR)/services
+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient
+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/errors
+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/locks
+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/incoming
+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/named_pipes
+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/services
+	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -m 755 -d $(DESTDIR)$(MSERVICEDIR)/scripts
 
 	( cd services ;\
 	  for service in * ; do \
 		  $(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 $$service $(DESTDIR)$(MLIBDIR)/services; \
-		  $(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/services/$$service ; \
-		  $(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)$(SPOOLDIR)/smsclient/errors/$$service ; \
 	  done )
 
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 scripts/email $(DESTDIR)$(MSERVICEDIR)/scripts
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_config $(DESTDIR)$(MSERVICEDIR)
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_addressbook $(DESTDIR)$(MSERVICEDIR)
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_modem $(DESTDIR)$(MSERVICEDIR)
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_services $(DESTDIR)$(MSERVICEDIR)
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 644 sms_daemons $(DESTDIR)$(MSERVICEDIR)
+	$(INSTALL) -m 644 scripts/email $(DESTDIR)$(MSERVICEDIR)/scripts
+	$(INSTALL) -m 644 sms_config $(DESTDIR)$(MSERVICEDIR)
+	$(INSTALL) -m 644 sms_addressbook $(DESTDIR)$(MSERVICEDIR)
+	$(INSTALL) -m 644 sms_modem $(DESTDIR)$(MSERVICEDIR)
+	$(INSTALL) -m 644 sms_services $(DESTDIR)$(MSERVICEDIR)
+	$(INSTALL) -m 644 sms_daemons $(DESTDIR)$(MSERVICEDIR)
 	
 uninstall:
 	$(RM) $(DESTDIR)$(MLIBDIR)/services/*
diff -Nur smsclient-2.0.9a.orig/sms/sms_config smsclient-2.0.9a/sms/sms_config
--- smsclient-2.0.9a.orig/sms/sms_config	2006-02-25 12:52:12.203797250 +0200
+++ smsclient-2.0.9a/sms/sms_config	2006-02-25 12:49:49.166858000 +0200
@@ -9,7 +9,7 @@
 
 	SMS_lock_action	     = "BLOCK"
 	SMS_lock_retry_delay = 5000000
-	SMS_lockfile         = "/var/lock/smslock"
+	SMS_lockfile         = "/var/lock/sms/client.lock"
 
 	# SMS_lockfile        = "/var/opt/sms/smslock"	# UNIXWARE
 }
diff -Nur smsclient-2.0.9a.orig/src/client/Makefile smsclient-2.0.9a/src/client/Makefile
--- smsclient-2.0.9a.orig/src/client/Makefile	2006-02-25 12:52:12.203797250 +0200
+++ smsclient-2.0.9a/src/client/Makefile	2006-02-25 12:49:49.166858000 +0200
@@ -35,9 +35,9 @@
 all: ../../bin/sms_client ../../bin/sms_address 
 
 install: ../../bin/sms_client ../../bin/sms_address
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(BINDIR)
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -s ../../bin/sms_client $(BINDIR)
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -s ../../bin/sms_address $(BINDIR)
+	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 ../../bin/sms_client $(DESTDIR)/$(BINDIR)
+	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 ../../bin/sms_address $(DESTDIR)/$(BINDIR)
 
 uninstall:
 	$(RM) $(BINDIR)/sms_client
diff -Nur smsclient-2.0.9a.orig/src/logfile/Makefile smsclient-2.0.9a/src/logfile/Makefile
--- smsclient-2.0.9a.orig/src/logfile/Makefile	2006-02-25 12:52:12.203797250 +0200
+++ smsclient-2.0.9a/src/logfile/Makefile	2006-02-25 12:49:49.166858000 +0200
@@ -34,7 +34,7 @@
 all: logfile.o
 
 install:
-	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(LOGDIR)
+#	$(INSTALL) -o $(SMSUSER) -g $(SMSGROUP) -m 755 -d $(LOGDIR)
 
 clean:
 	$(RM) *.o