[Fedora-directory-commits] winsync/usersync package.mak,1.1,1.2

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/winsync/usersync
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11302/usersync

Modified Files:
	package.mak 
Log Message:
Changed unix style line endings to DOS style for nmake makefiles


Index: package.mak
===================================================================
RCS file: /cvs/dirsec/winsync/usersync/package.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.mak	10 Nov 2005 00:04:42 -0000	1.1
+++ package.mak	10 Nov 2005 00:36:51 -0000	1.2
@@ -1,72 +1,72 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Packaging nmake Makefile for ntds.msi
-#
-
-ALL : ntds.msi
-
-LAYOUT :
-	mkdir "$(PKGDIR)\bin"
-	copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
-	copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
-	copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
-	copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
-	copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
-	copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
-	copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
-	
-	mkdir "$(PKGDIR)\conf"
-	copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
-	copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
-
-	mkdir "$(PKGDIR)\lib"
-	copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
-	copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
-	copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
-
-	mkdir "$(PKGDIR)\logs"
-
-
-ntds.msi : LAYOUT
-	mkdir "$(PKGDIR)\Binary"
-	copy /Y wix\Binary "$(PKGDIR)\Binary"
-	cd "$(PKGDIR)"
-	candle "$(WXSDIR)\ntds.wxs"
-	light ntds.wixobj
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+# 
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+# 
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
+# 
+# 
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# Packaging nmake Makefile for ntds.msi
+#
+
+ALL : ntds.msi
+
+LAYOUT :
+	mkdir "$(PKGDIR)\bin"
+	copy /Y "$(WRAPPER_FILES)\bin\wrapper.exe" "$(PKGDIR)\bin\"
+	copy /Y "$(WRAPPER_FILES)\bin\InstallTestWrapper-NT.bat" "$(PKGDIR)\bin\installusersync.bat"
+	copy /Y "$(WRAPPER_FILES)\bin\UninstallTestWrapper-NT.bat" "$(PKGDIR)\bin\uninstallusersync.bat"
+	copy /Y wrapper\usersync.bat "$(PKGDIR)\bin"
+	copy /Y "$(APACHEDS_FILE)" "$(PKGDIR)\bin\apacheds-main.jar"
+	copy /Y "$(OBJDEST)\netman\jnetman.jar" "$(PKGDIR)\bin"
+	copy /Y "$(OBJDEST)\apacheds\usersync.jar" "$(PKGDIR)\bin"
+	
+	mkdir "$(PKGDIR)\conf"
+	copy /Y wrapper\wrapper.conf "$(PKGDIR)\conf"
+	copy /Y wrapper\usersync.conf "$(PKGDIR)\conf"
+
+	mkdir "$(PKGDIR)\lib"
+	copy /Y "$(WRAPPER_FILES)\lib\wrapper.dll" "$(PKGDIR)\lib"
+	copy /Y "$(WRAPPER_FILES)\lib\wrapper.jar" "$(PKGDIR)\lib"
+	copy /Y "$(OBJDEST)\netman\jnetman.dll" "$(PKGDIR)\lib"
+
+	mkdir "$(PKGDIR)\logs"
+
+
+ntds.msi : LAYOUT
+	mkdir "$(PKGDIR)\Binary"
+	copy /Y wix\Binary "$(PKGDIR)\Binary"
+	cd "$(PKGDIR)"
+	candle "$(WXSDIR)\ntds.wxs"
+	light ntds.wixobj