Browse Source

also use DESTDIR in makefile.m{ingw,svc}

Steffen Jaeckel 8 năm trước cách đây
mục cha
commit
1655e63c49
2 tập tin đã thay đổi với 22 bổ sung20 xóa
  1. 12 11
      makefile.mingw
  2. 10 9
      makefile.msvc

+ 12 - 11
makefile.mingw

@@ -15,6 +15,7 @@
 #
 #
 
 
 #The following can be overridden from command line e.g. make -f makefile.mingw CC=gcc ARFLAGS=rcs
 #The following can be overridden from command line e.g. make -f makefile.mingw CC=gcc ARFLAGS=rcs
+DESTDIR   =
 PREFIX    = c:\mingw
 PREFIX    = c:\mingw
 CC        = gcc
 CC        = gcc
 AR        = ar
 AR        = ar
@@ -263,20 +264,20 @@ clean:
 
 
 #Install the library + headers
 #Install the library + headers
 install: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D)
 install: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D)
-	cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
-	cmd /c if not exist "$(PREFIX)\lib" mkdir "$(PREFIX)\lib"
-	cmd /c if not exist "$(PREFIX)\include" mkdir "$(PREFIX)\include"
-	copy /Y $(LIBMAIN_S) "$(PREFIX)\lib"
-	copy /Y $(LIBMAIN_I) "$(PREFIX)\lib"
-	copy /Y $(LIBMAIN_D) "$(PREFIX)\bin"
-	copy /Y src\headers\tomcrypt*.h "$(PREFIX)\include"
+	cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
+	cmd /c if not exist "$(DESTDIR)$(PREFIX)\lib" mkdir "$(DESTDIR)$(PREFIX)\lib"
+	cmd /c if not exist "$(DESTDIR)$(PREFIX)\include" mkdir "$(DESTDIR)$(PREFIX)\include"
+	copy /Y $(LIBMAIN_S) "$(DESTDIR)$(PREFIX)\lib"
+	copy /Y $(LIBMAIN_I) "$(DESTDIR)$(PREFIX)\lib"
+	copy /Y $(LIBMAIN_D) "$(DESTDIR)$(PREFIX)\bin"
+	copy /Y src\headers\tomcrypt*.h "$(DESTDIR)$(PREFIX)\include"
 
 
 #Install useful tools
 #Install useful tools
 install_bins: hashsum
 install_bins: hashsum
-	cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
-	copy /Y hashsum.exe "$(PREFIX)\bin"
+	cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
+	copy /Y hashsum.exe "$(DESTDIR)$(PREFIX)\bin"
 
 
 #Install documentation
 #Install documentation
 install_docs: doc/crypt.pdf
 install_docs: doc/crypt.pdf
-	cmd /c if not exist "$(PREFIX)\doc" mkdir "$(PREFIX)\doc"
-	copy /Y doc\crypt.pdf "$(PREFIX)\doc"
+	cmd /c if not exist "$(DESTDIR)$(PREFIX)\doc" mkdir "$(DESTDIR)$(PREFIX)\doc"
+	copy /Y doc\crypt.pdf "$(DESTDIR)$(PREFIX)\doc"

+ 10 - 9
makefile.msvc

@@ -15,6 +15,7 @@
 #
 #
 
 
 #The following can be overridden from command line e.g. make -f makefile.msvc CC=gcc ARFLAGS=rcs
 #The following can be overridden from command line e.g. make -f makefile.msvc CC=gcc ARFLAGS=rcs
+DESTDIR   =
 PREFIX    = c:\devel
 PREFIX    = c:\devel
 CFLAGS    = /Ox /DUSE_LTM /DLTM_DESC /I../libtommath
 CFLAGS    = /Ox /DUSE_LTM /DLTM_DESC /I../libtommath
 EXTRALIBS = ../libtommath/tommath.lib
 EXTRALIBS = ../libtommath/tommath.lib
@@ -250,18 +251,18 @@ clean:
 
 
 #Install the library + headers
 #Install the library + headers
 install: $(LIBMAIN_S)
 install: $(LIBMAIN_S)
-	cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
-	cmd /c if not exist "$(PREFIX)\lib" mkdir "$(PREFIX)\lib"
-	cmd /c if not exist "$(PREFIX)\include" mkdir "$(PREFIX)\include"
-	copy /Y $(LIBMAIN_S) "$(PREFIX)\lib"
-	copy /Y src\headers\tomcrypt*.h "$(PREFIX)\include"
+	cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
+	cmd /c if not exist "$(DESTDIR)$(PREFIX)\lib" mkdir "$(DESTDIR)$(PREFIX)\lib"
+	cmd /c if not exist "$(DESTDIR)$(PREFIX)\include" mkdir "$(DESTDIR)$(PREFIX)\include"
+	copy /Y $(LIBMAIN_S) "$(DESTDIR)$(PREFIX)\lib"
+	copy /Y src\headers\tomcrypt*.h "$(DESTDIR)$(PREFIX)\include"
 
 
 #Install useful tools
 #Install useful tools
 install_bins: hashsum
 install_bins: hashsum
-	cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
-	copy /Y hashsum.exe "$(PREFIX)\bin"
+	cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
+	copy /Y hashsum.exe "$(DESTDIR)$(PREFIX)\bin"
 
 
 #Install documentation
 #Install documentation
 install_docs: doc/crypt.pdf
 install_docs: doc/crypt.pdf
-	cmd /c if not exist "$(PREFIX)\doc" mkdir "$(PREFIX)\doc"
-	copy /Y doc\crypt.pdf "$(PREFIX)\doc"
+	cmd /c if not exist "$(DESTDIR)$(PREFIX)\doc" mkdir "$(DESTDIR)$(PREFIX)\doc"
+	copy /Y doc\crypt.pdf "$(DESTDIR)$(PREFIX)\doc"