[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.45, 1.46

Noriko Hosoi (nhosoi) fedora-directory-commits at redhat.com
Fri Mar 24 19:13:34 UTC 2006


Author: nhosoi

Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20013

Modified Files:
	pkgadmin.mk 
Log Message:
[186105] Admin Server Makefile updates for Internal build
Allow FollowSymLinks in java dir



Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pkgadmin.mk	24 Mar 2006 01:12:27 -0000	1.45
+++ pkgadmin.mk	24 Mar 2006 19:13:11 -0000	1.46
@@ -153,9 +153,15 @@
 	-$(MKDIR) $(CLIENT_DIR)/java/jars
 
 # grab the jar files
+ifeq ($(ARCH), WINNT)
+# no symlink on Windows
+	cd $(ADMIN_JARS) ; \
+	cp -p $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
+else
 	cd $(ADMIN_JARS) ; \
 	cp -p $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars; \
 	(cd $(CLIENT_DIR)/java/jars; ln -s $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_GEN_SUF).jar; ln -s $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(ADMIN_BRAND)-admserv-$(ADM_GEN_SUF)_en.jar)
+endif
 
 #
 # Cleanup before making distributable zip




More information about the Fedora-directory-commits mailing list