Partial changes to the make system to deal with the new CASA directory/rpm

structure.

CASA-auth-token/server/PamSupport/linux/Makefile.am

@@ -31,9 +31,11 @@ SUBDIRS =
 
 DIST_SUBDIRS =
 
-CASAROOT = ../../../..
+ROOT = ../../..
 
-CASALIBDIR = $(CASAROOT)/$(LIB)
+CASAINCLUDE = ../../../../CASA/include
+
+LIBDIR = $(ROOT)/$(LIB)
 
 # handle Mono secondary dependencies
 export MONO_PATH := $(MONO_PATH)
@@ -47,13 +49,13 @@ MODULE_EXT = so
 CFILES = ../pam_authtoken.c
 
 CSFILES_CSC :=
-INCLUDES = -I. -I$(CASAROOT)/include
+INCLUDES = -I. -I$(CASAINCLUDE) -I../../../include
 RESOURCES =
 DEFINES = -Wno-format-extra-args -fno-strict-aliasing 
 
 CFLAGS += $(INCLUDES) $(DEFINES)
 LIBS = -lpthread -lpam -lcasa_s_authtoken
-LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(CASALIBDIR)/$(TARGET_CFG) -Xlinker -rpath -Xlinker /opt/novell/CASA/lib
+LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG) -Xlinker -rpath
 
 OBJDIR = ./$(TARGET_CFG)/$(LIB)
 OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
@@ -79,12 +81,12 @@ $(OBJDIR)/%.o: %.cpp
 $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
 	@echo [======== Linking $@ ========]
 	$(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
-	cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
+	cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
 
 $(OBJDIR):
 	[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
-	[ -d $(CASALIBDIR) ] || mkdir -p $(CASALIBDIR)
-	[ -d $(CASALIBDIR)/$(TARGET_CFG) ] || mkdir -p $(CASALIBDIR)/$(TARGET_CFG)
+	[ -d $(LIBDIR) ] || mkdir -p $(LIBDIR)
+	[ -d $(LIBDIR)/$(TARGET_CFG) ] || mkdir -p $(LIBDIR)/$(TARGET_CFG)
 
 install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)