* Makefile.in (dumper): Change logic for libbfd and libintl so that they will
be found either in the build tree or the installed directory. * mkpasswd.c (enum_users): Add a comment as a password for NT.
This commit is contained in:
		| @@ -1,3 +1,9 @@ | |||||||
|  | Wed Sep  5 22:37:21 2001  Christopher Faylor <cgf@cygnus.com> | ||||||
|  |  | ||||||
|  | 	* Makefile.in (dumper): Change logic for libbfd and libintl so that | ||||||
|  | 	they will be found either in the build tree or the installed directory. | ||||||
|  | 	* mkpasswd.c (enum_users): Add a comment as a password for NT. | ||||||
|  |  | ||||||
| 2001-09-03  Michael A Chase <mchase@ix.netcom.com> | 2001-09-03  Michael A Chase <mchase@ix.netcom.com> | ||||||
|  |  | ||||||
| 	* mount.cc (mount_commands): Don't write /cygdrive/u mount points. | 	* mount.cc (mount_commands): Don't write /cygdrive/u mount points. | ||||||
|   | |||||||
| @@ -37,9 +37,9 @@ include $(srcdir)/../Makefile.common | |||||||
|  |  | ||||||
| MINGW_INCLUDES:=-I$(mingw_source)/include -I$(cygwin_source)/include -I$(w32api_include) | MINGW_INCLUDES:=-I$(mingw_source)/include -I$(cygwin_source)/include -I$(w32api_include) | ||||||
|  |  | ||||||
| libbfd:=$(bupdir2)/bfd/libbfd.a | libbfd:=${shell $(CC) -L$(bupdir2)/bfd --print-file-name=libbfd.a} | ||||||
| libintl:=$(bupdir2)/intl/libintl.a | libintl:=${shell $(CC) -L$(bupdir2)/intl --print-file-name=libintl.a} | ||||||
| build_dumper:=${shell test -r $(libbfd) -a -r $(libintl) -a -d $(updir1)/include && echo 1} | build_dumper:=${shell test -r $(libbfd) && test -r ${libintl} &&  echo 1} | ||||||
|  |  | ||||||
| DUMPER_INCLUDES:=-I$(bupdir2)/bfd -I$(updir1)/include | DUMPER_INCLUDES:=-I$(bupdir2)/bfd -I$(updir1)/include | ||||||
|  |  | ||||||
| @@ -59,7 +59,7 @@ ALL_LDLIBS:=${patsubst $(w32api_lib)/lib%.a,-l%,\ | |||||||
| 		${filter-out $(libcygwin), $(ALL_DEP_LDLIBS)}}}} | 		${filter-out $(libcygwin), $(ALL_DEP_LDLIBS)}}}} | ||||||
|  |  | ||||||
| MINGW_LIB:=$(mingw_build)/libmingw32.a | MINGW_LIB:=$(mingw_build)/libmingw32.a | ||||||
| DUMPER_LIB:=-L$(bupdir2)/bfd -lbfd -L$(bupdir1)/libiberty -liberty -L$(bupdir2)/intl -lintl | DUMPER_LIB:=${libbfd} ${libintl} -L$(bupdir1)/libiberty -liberty | ||||||
| MINGW_LDLIBS:=$(ALL_LDLIBS) $(MINGW_LIB) | MINGW_LDLIBS:=$(ALL_LDLIBS) $(MINGW_LIB) | ||||||
| MINGW_DEP_LDLIBS:=${ALL_DEP_LDLIBS} ${MINGW_LIB} | MINGW_DEP_LDLIBS:=${ALL_DEP_LDLIBS} ${MINGW_LIB} | ||||||
| ALL_LDFLAGS:=-B$(newlib_build)/libc/ -B$(newlib_build)/libm/ -B$(w32api_lib)/ \ | ALL_LDFLAGS:=-B$(newlib_build)/libc/ -B$(newlib_build)/libm/ -B$(w32api_lib)/ \ | ||||||
|   | |||||||
| @@ -206,7 +206,7 @@ enum_users (LPWSTR servername, int print_sids, int print_cygpath, | |||||||
| 		    } | 		    } | ||||||
| 		} | 		} | ||||||
| 	    } | 	    } | ||||||
| 	  printf ("%s::%d:%d:%s%s%s:%s:/bin/bash\n", username, | 	  printf ("%s:This_field_is_not_used_by_cygwin_on_nt/2000/xp:%d:%d:%s%s%s:%s:/bin/bash\n", username, | ||||||
| 		  uid + id_offset, | 		  uid + id_offset, | ||||||
| 		  gid + id_offset, | 		  gid + id_offset, | ||||||
| 		  fullname, | 		  fullname, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user