Skip to content

Commit 1655e63

Browse files
committed
also use DESTDIR in makefile.m{ingw,svc}
1 parent af984dc commit 1655e63

2 files changed

Lines changed: 22 additions & 20 deletions

File tree

makefile.mingw

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#
1616

1717
#The following can be overridden from command line e.g. make -f makefile.mingw CC=gcc ARFLAGS=rcs
18+
DESTDIR =
1819
PREFIX = c:\mingw
1920
CC = gcc
2021
AR = ar
@@ -263,20 +264,20 @@ clean:
263264

264265
#Install the library + headers
265266
install: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D)
266-
cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
267-
cmd /c if not exist "$(PREFIX)\lib" mkdir "$(PREFIX)\lib"
268-
cmd /c if not exist "$(PREFIX)\include" mkdir "$(PREFIX)\include"
269-
copy /Y $(LIBMAIN_S) "$(PREFIX)\lib"
270-
copy /Y $(LIBMAIN_I) "$(PREFIX)\lib"
271-
copy /Y $(LIBMAIN_D) "$(PREFIX)\bin"
272-
copy /Y src\headers\tomcrypt*.h "$(PREFIX)\include"
267+
cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
268+
cmd /c if not exist "$(DESTDIR)$(PREFIX)\lib" mkdir "$(DESTDIR)$(PREFIX)\lib"
269+
cmd /c if not exist "$(DESTDIR)$(PREFIX)\include" mkdir "$(DESTDIR)$(PREFIX)\include"
270+
copy /Y $(LIBMAIN_S) "$(DESTDIR)$(PREFIX)\lib"
271+
copy /Y $(LIBMAIN_I) "$(DESTDIR)$(PREFIX)\lib"
272+
copy /Y $(LIBMAIN_D) "$(DESTDIR)$(PREFIX)\bin"
273+
copy /Y src\headers\tomcrypt*.h "$(DESTDIR)$(PREFIX)\include"
273274

274275
#Install useful tools
275276
install_bins: hashsum
276-
cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
277-
copy /Y hashsum.exe "$(PREFIX)\bin"
277+
cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
278+
copy /Y hashsum.exe "$(DESTDIR)$(PREFIX)\bin"
278279

279280
#Install documentation
280281
install_docs: doc/crypt.pdf
281-
cmd /c if not exist "$(PREFIX)\doc" mkdir "$(PREFIX)\doc"
282-
copy /Y doc\crypt.pdf "$(PREFIX)\doc"
282+
cmd /c if not exist "$(DESTDIR)$(PREFIX)\doc" mkdir "$(DESTDIR)$(PREFIX)\doc"
283+
copy /Y doc\crypt.pdf "$(DESTDIR)$(PREFIX)\doc"

makefile.msvc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#
1616

1717
#The following can be overridden from command line e.g. make -f makefile.msvc CC=gcc ARFLAGS=rcs
18+
DESTDIR =
1819
PREFIX = c:\devel
1920
CFLAGS = /Ox /DUSE_LTM /DLTM_DESC /I../libtommath
2021
EXTRALIBS = ../libtommath/tommath.lib
@@ -250,18 +251,18 @@ clean:
250251

251252
#Install the library + headers
252253
install: $(LIBMAIN_S)
253-
cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
254-
cmd /c if not exist "$(PREFIX)\lib" mkdir "$(PREFIX)\lib"
255-
cmd /c if not exist "$(PREFIX)\include" mkdir "$(PREFIX)\include"
256-
copy /Y $(LIBMAIN_S) "$(PREFIX)\lib"
257-
copy /Y src\headers\tomcrypt*.h "$(PREFIX)\include"
254+
cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
255+
cmd /c if not exist "$(DESTDIR)$(PREFIX)\lib" mkdir "$(DESTDIR)$(PREFIX)\lib"
256+
cmd /c if not exist "$(DESTDIR)$(PREFIX)\include" mkdir "$(DESTDIR)$(PREFIX)\include"
257+
copy /Y $(LIBMAIN_S) "$(DESTDIR)$(PREFIX)\lib"
258+
copy /Y src\headers\tomcrypt*.h "$(DESTDIR)$(PREFIX)\include"
258259

259260
#Install useful tools
260261
install_bins: hashsum
261-
cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
262-
copy /Y hashsum.exe "$(PREFIX)\bin"
262+
cmd /c if not exist "$(DESTDIR)$(PREFIX)\bin" mkdir "$(DESTDIR)$(PREFIX)\bin"
263+
copy /Y hashsum.exe "$(DESTDIR)$(PREFIX)\bin"
263264

264265
#Install documentation
265266
install_docs: doc/crypt.pdf
266-
cmd /c if not exist "$(PREFIX)\doc" mkdir "$(PREFIX)\doc"
267-
copy /Y doc\crypt.pdf "$(PREFIX)\doc"
267+
cmd /c if not exist "$(DESTDIR)$(PREFIX)\doc" mkdir "$(DESTDIR)$(PREFIX)\doc"
268+
copy /Y doc\crypt.pdf "$(DESTDIR)$(PREFIX)\doc"

0 commit comments

Comments
 (0)