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

structure.

CASA-auth-token/server/JaasSupport/Makefile.am

@@ -19,17 +19,14 @@
 #
 #######################################################################
 
-SUBDIRS =
-DIST_SUBDIRS = src src/com src/com/novell src/com/novell/casa src/com/novell/casa/jaas
+SUBDIRS = src
+DIST_SUBDIRS = src
 
 EXTRA_DIST = $(JAVAFILES)
 
-CASAROOT = ../../..
+ROOT = ../..
 
-CASALIBDIR = $(CASAROOT)/$(LIB)
-
-#IDENT_ABSTRACTION_DIR = /home/jluciani/dev-local/bandit/trunk/IdentityAbstraction/build
-#IDENT_ABSTRACTION_DEPENDANCIES_DIR = /home/jluciani/dev-local/bandit/trunk/commons/bin
+LIBDIR = $(ROOT)/$(LIB)
 
 JAVAROOT = .
 JAVAC= javac
@@ -45,7 +42,7 @@ BUILDDIR = build
 CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
 
 LIBS =
-CLASSPATH = $(CASALIBDIR)/java/CasaAuthToken.jar:$(LIBS)
+CLASSPATH = $(LIBDIR)/java/CasaAuthToken.jar:$(LIBS)
 
 CUR_DIR := $(shell pwd)
 
@@ -58,12 +55,13 @@ $(BUILDDIR)/%.class: %.java
 $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT): $(BUILDDIR) $(CLASSES)
 	@echo [======== Jarring $@ ========]
 	jar cvf $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) -C $(BUILDDIR)/classes .
-	cp $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/java/
+	cp $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/java/
 
 $(BUILDDIR):
 	[ -d $(BUILDDIR) ] || mkdir -p $(BUILDDIR)
 	[ -d $(BUILDDIR)/classes ] || mkdir -p $(BUILDDIR)/classes
-	[ -d $(CASALIBDIR) ] || mkdir -p $(CASALIBDIR)
+	[ -d $(LIBDIR) ] || mkdir -p $(LIBDIR)
+	[ -d $(LIBDIR)/java ] || mkdir -p $(LIBDIR)/java
 
 install-exec-local:
 
@@ -73,7 +71,7 @@ uninstall-local:
 
 clean-local:
 	if [ -d $(BUILDDIR) ]; then  rm -rf $(BUILDDIR); fi
-	if [ -f $(CASALIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT) ]; then  rm -f $(CASALIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT); fi
+	if [ -f $(LIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT) ]; then  rm -f $(LIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT); fi
 
 distclean-local: