~ubuntu-branches/ubuntu/natty/curl/natty

« back to all changes in this revision

Viewing changes to src/Makefile.vc8

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-10-07 16:53:40 UTC
  • mfrom: (3.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20101007165340-3eahi7unrkt7magp
Tags: 7.21.1-1ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Keep build deps in main:
    - Drop build dependencies: stunnel, libssh2-1-dev
    - Add build-dependency on openssh-server
    - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
 
15
15
PROGRAM_NAME = curl.exe
16
16
 
 
17
!IFNDEF OPENSSL_PATH
 
18
OPENSSL_PATH = ../../openssl-0.9.8o
 
19
!ENDIF
 
20
 
17
21
!IFNDEF ZLIB_PATH
18
 
ZLIB_PATH = ../../zlib-1.2.3
19
 
!ENDIF
20
 
 
21
 
!IFNDEF OPENSSL_PATH
22
 
OPENSSL_PATH = ../../openssl-0.9.8g
 
22
ZLIB_PATH = ../../zlib-1.2.5
23
23
!ENDIF
24
24
 
25
25
!IFNDEF MACHINE